Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / avr32 / kernel / Makefile

diff --git a/arch/avr32/kernel/Makefile b/arch/avr32/kernel/Makefile
index 90e5aff..e4b6d12 100644 (file)
--- a/arch/avr32/kernel/Makefile
+++ b/arch/avr32/kernel/Makefile
@@ -6,13 +6,10 @@ extra-y                               := head.o vmlinux.lds
 
 obj-$(CONFIG_SUBARCH_AVR32B)   += entry-avr32b.o
 obj-y                          += syscall_table.o syscall-stubs.o irq.o
-obj-y                          += setup.o traps.o semaphore.o ptrace.o
+obj-y                          += setup.o traps.o semaphore.o ocd.o ptrace.o
 obj-y                          += signal.o sys_avr32.o process.o time.o
 obj-y                          += init_task.o switch_to.o cpu.o
 obj-$(CONFIG_MODULES)          += module.o avr32_ksyms.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
-
-USE_STANDARD_AS_RULE           := true
-
-%.lds: %.lds.c FORCE
-       $(call if_changed_dep,cpp_lds_S)
+obj-$(CONFIG_STACKTRACE)       += stacktrace.o
+obj-$(CONFIG_NMI_DEBUGGING)    += nmi_debug.o