diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:21:23 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 18:21:23 +0200 |
| commit | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (patch) | |
| tree | 6dac80c846592901cbfdcff029525d7994465282 /arch/arm/oprofile/Makefile | |
| parent | ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIO (diff) | |
| parent | ARM: 6074/1: oprofile: convert from sysdev to platform device (diff) | |
| download | linux-fda0e18c8a7a3e02747c2b045b4fcd2c920410b9.tar.xz linux-fda0e18c8a7a3e02747c2b045b4fcd2c920410b9.zip | |
Merge branch 'devel-pmu' into devel
Diffstat (limited to 'arch/arm/oprofile/Makefile')
| -rw-r--r-- | arch/arm/oprofile/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile index 88e31f549f50..e666eafed152 100644 --- a/arch/arm/oprofile/Makefile +++ b/arch/arm/oprofile/Makefile @@ -6,9 +6,4 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofilefs.o oprofile_stats.o \ timer_int.o ) -oprofile-y := $(DRIVER_OBJS) common.o backtrace.o -oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o -oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o -oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o -oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o -oprofile-$(CONFIG_OPROFILE_ARMV7) += op_model_v7.o +oprofile-y := $(DRIVER_OBJS) common.o |