From b6cc6cef5a46706b671ec77175c09f311415eee6 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 12 Nov 2009 16:20:36 +0900 Subject: [PATCH] --- yaml --- r: 173488 b: refs/heads/master c: c4e708dc52b0e68d81a322ad11b280374685956e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4/Makefile | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8589566d7147..5ecba79f9a0f 100644 --- 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 index c39c1235db91..3a1dbc709831 100644 --- 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)