Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[linux-2.6-omap-h63xx.git] / arch / sh / kernel / Makefile_32

diff --git a/arch/sh/kernel/Makefile_32 b/arch/sh/kernel/Makefile_32
index c5a85bfbd4510403e7037457e843ca94a8b6f252..4bbdce36b92b2dd95483202024275ffd1f79bb81 100644 (file)
--- a/arch/sh/kernel/Makefile_32
+++ b/arch/sh/kernel/Makefile_32
@@ -5,8 +5,8 @@
 extra-y        := head_32.o init_task.o vmlinux.lds
 
 obj-y  := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \
-          ptrace_32.o semaphore.o setup.o signal_32.o sys_sh.o \
-          syscalls_32.o time.o topology.o traps_32.o
+          ptrace_32.o setup.o signal_32.o sys_sh.o sys_sh32.o \
+          syscalls_32.o time_32.o topology.o traps.o traps_32.o
 
 obj-y                          += cpu/ timers/
 obj-$(CONFIG_VSYSCALL)         += vsyscall/
@@ -15,11 +15,13 @@ obj-$(CONFIG_CF_ENABLER)    += cf-enabler.o
 obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o
 obj-$(CONFIG_SH_KGDB)          += kgdb_stub.o kgdb_jmp.o
 obj-$(CONFIG_SH_CPU_FREQ)      += cpufreq.o
-obj-$(CONFIG_MODULES)          += sh_ksyms.o module.o
+obj-$(CONFIG_MODULES)          += sh_ksyms_32.o module.o
 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o
 obj-$(CONFIG_KEXEC)            += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)       += crash_dump.o
 obj-$(CONFIG_PM)               += pm.o
 obj-$(CONFIG_STACKTRACE)       += stacktrace.o
+obj-$(CONFIG_BINFMT_ELF)       += dump_task.o
+obj-$(CONFIG_IO_TRAPPED)       += io_trapped.o
 
 EXTRA_CFLAGS += -Werror