diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-19 22:57:38 -0400 |
| commit | ffee72d4681c8777918268a96aef42bdeb6c367b (patch) | |
| tree | 4baf91483886d561c198ed0524ab54b783273e86 /arch/arm/oprofile/Makefile | |
| parent | fb54d268329846aa13b2bc44a64d90e9b7131192 (diff) | |
| parent | f72caf7e496465182eeda842ac66a5e75404ddf1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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/, \ | |||
| 6 | oprofilefs.o oprofile_stats.o \ | 6 | oprofilefs.o oprofile_stats.o \ |
| 7 | timer_int.o ) | 7 | timer_int.o ) |
| 8 | 8 | ||
| 9 | oprofile-y := $(DRIVER_OBJS) common.o backtrace.o | 9 | oprofile-y := $(DRIVER_OBJS) common.o |
| 10 | oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o | ||
| 11 | oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o | ||
| 12 | oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o | ||
| 13 | oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o | ||
| 14 | oprofile-$(CONFIG_OPROFILE_ARMV7) += op_model_v7.o | ||