diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:35:09 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 19:35:09 +0300 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /arch/sh/kernel/cpu/sh4/Makefile | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
| download | linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.tar.xz | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/Makefile')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/sh4/Makefile b/arch/sh/kernel/cpu/sh4/Makefile index 203b18347b83..3a1dbc709831 100644 --- a/arch/sh/kernel/cpu/sh4/Makefile +++ b/arch/sh/kernel/cpu/sh4/Makefile @@ -9,6 +9,11 @@ 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 @@ -27,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) |