diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 15:00:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-28 15:00:08 -0700 |
| commit | 7e568e62e9d4674d487cdc11f369e49e56ce6703 (patch) | |
| tree | 3d9c1c04341ccadb5d4b9c73eda50b62f0f103b3 /arch/arm/oprofile/Makefile | |
| parent | adb2705a89e8b41abcf29c0ed86f4ce93ab36734 (diff) | |
| parent | 50273978975ee62938b7ca612e281927cd789c13 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/oprofile/Makefile')
| -rw-r--r-- | arch/arm/oprofile/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/oprofile/Makefile b/arch/arm/oprofile/Makefile index ba1a6e9f2b2..8ffb523e6c7 100644 --- a/arch/arm/oprofile/Makefile +++ b/arch/arm/oprofile/Makefile @@ -6,6 +6,6 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofilefs.o oprofile_stats.o \ timer_int.o ) -oprofile-y := $(DRIVER_OBJS) init.o +oprofile-y := $(DRIVER_OBJS) init.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += common.o op_model_xscale.o |