---

yaml --- r: 173488 b: refs/heads/master c: c4e708d h: refs/heads/master v: v3
git-mirror · Nov 12, 2009 · b6cc6ce · b6cc6ce
1 parent c407041
commit b6cc6ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4d9d0b8a8d2a81b3189bd99482aab967ce86120
+refs/heads/master: c4e708dc52b0e68d81a322ad11b280374685956e
diff --git a/trunk/arch/sh/kernel/cpu/sh4/Makefile b/trunk/arch/sh/kernel/cpu/sh4/Makefile
@@ -10,9 +10,9 @@ obj-$(CONFIG_SH_FPU)			+= fpu.o softfloat.o
 obj-$(CONFIG_SH_STORE_QUEUES)		+= sq.o
 
 # Perf events
-obj-$(CONFIG_CPU_SUBTYPE_SH7750)	+= perf_event.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7750S)	+= perf_event.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7091)	+= perf_event.o
+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
@@ -32,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)