Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux

[linux-block.git] / arch / arm / kernel / Makefile

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index c38c8b019d24c6103a06ccaebd441929d3ac6c69..ae295a3bcfefddad015d56e79a4af37b80d66487 100644 (file)
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -17,7 +17,7 @@ CFLAGS_REMOVE_return_address.o = -pg
 # Object file lists.
 
 obj-y          := elf.o entry-common.o irq.o opcodes.o \
-                  process.o ptrace.o reboot.o \
+                  process.o ptrace.o reboot.o io.o \
                   setup.o signal.o sigreturn_codes.o \
                   stacktrace.o sys_arm.o time.o traps.o
 
@@ -86,10 +86,6 @@ AFLAGS_iwmmxt.o                      := -Wa,-mcpu=iwmmxt
 obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
 obj-$(CONFIG_VDSO)             += vdso.o
 obj-$(CONFIG_EFI)              += efi.o
-
-ifneq ($(CONFIG_ARCH_EBSA110),y)
-  obj-y                += io.o
-endif
 obj-$(CONFIG_PARAVIRT) += paravirt.o
 
 head-y                 := head$(MMUEXT).o