Merge branch 'for-linus-1' of git://git.infradead.org/mtd-2.6

[~andy/linux] / arch / h8300 / kernel / Makefile

diff --git a/arch/h8300/kernel/Makefile b/arch/h8300/kernel/Makefile
index 6c248c3c5c3b92cf9084da1b3542440b4b920b49..8d4d2a54be9efd83afc94935b359a59288504911 100644 (file)
--- a/arch/h8300/kernel/Makefile
+++ b/arch/h8300/kernel/Makefile
@@ -7,6 +7,6 @@ extra-y := vmlinux.lds
 obj-y := process.o traps.o ptrace.o irq.o \
         sys_h8300.o time.o signal.o \
          setup.o gpio.o init_task.o syscalls.o \
-        entry.o
+        entry.o timer/
 
 obj-$(CONFIG_MODULES) += module.o h8300_ksyms.o