sh: Fix up the CONFIG_PERF_EVENTS=n build for SH-4.

[safe/jmp/linux-2.6] / arch / sh / kernel / cpu / sh4 / Makefile

diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile
index 8add10b..3a1dbc7 100644 (file)
--- a/arch/sh/kernel/cpu/sh4/Makefile
+++ b/arch/sh/kernel/cpu/sh4/Makefile
@@ -5,12 +5,22 @@
 obj-y  := probe.o common.o
 common-y       += $(addprefix ../sh3/, entry.o ex.o)
 
-obj-$(CONFIG_SH_FPU)                   += fpu.o
+obj-$(CONFIG_HIBERNATION)              += $(addprefix ../sh3/, swsusp.o)
+obj-$(CONFIG_SH_FPU)                   += fpu.o softfloat.o
 obj-$(CONFIG_SH_STORE_QUEUES)          += sq.o
 
+# Perf events
+perf-$(CONFIG_CPU_SUBTYPE_SH7750)      := perf_event.o
+perf-$(CONFIG_CPU_SUBTYPE_SH7750S)     := perf_event.o
+perf-$(CONFIG_CPU_SUBTYPE_SH7091)      := perf_event.o
+
 # CPU subtype setup
 obj-$(CONFIG_CPU_SUBTYPE_SH7750)       += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7750R)      += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7750S)      += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7091)       += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7751)       += setup-sh7750.o
+obj-$(CONFIG_CPU_SUBTYPE_SH7751R)      += setup-sh7750.o
 obj-$(CONFIG_CPU_SUBTYPE_SH7760)       += setup-sh7760.o
 obj-$(CONFIG_CPU_SUBTYPE_SH4_202)      += setup-sh4-202.o
 
@@ -22,4 +32,5 @@ endif
 # Additional clocks by subtype
 clock-$(CONFIG_CPU_SUBTYPE_SH4_202)    += clock-sh4-202.o
 
-obj-y  += $(clock-y)
+obj-y                                  += $(clock-y)
+obj-$(CONFIG_PERF_EVENTS)              += $(perf-y)