Merge with Linux 2.4.0-test5-pre3.

1 files changed, 8 insertions, 14 deletions

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 7662f42ef..62c0ca60e 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -8,38 +8,32 @@
 HEAD_OBJ  = head-$(PROCESSOR).o
 ENTRY_OBJ = entry-$(PROCESSOR).o
 
-ifeq ($(CONFIG_ISA_DMA),y)
-  ISA_DMA_OBJS += dma-isa.o
-endif
-
 O_OBJS_arc        = dma-arc.o oldlatches.o
-O_OBJS_a5k        = dma-a5k.o
 O_OBJS_rpc        = dma-rpc.o
-O_OBJS_ebsa110    = dma-dummy.o
-O_OBJS_footbridge = dma.o dma-footbridge.o $(ISA_DMA_OBJS) hw-footbridge.o isa.o
-O_OBJS_clps7500   = dma-dummy.o
-O_OBJS_nexuspci   = dma-dummy.o
-O_OBJS_sa1100     = dma-dummy.o hw-sa1100.o
-O_OBJS_l7200      = dma-dummy.o fiq.o
+O_OBJS_footbridge = dma-footbridge.o hw-footbridge.o isa.o
+O_OBJS_sa1100     = hw-sa1100.o
+O_OBJS_l7200      = fiq.o
 
 O_TARGET := kernel.o
 
 # Object file lists.
 
-obj-y			:= arch.o $(ENTRY_OBJ) irq.o process.o ptrace.o \
+obj-y			:= arch.o dma.o $(ENTRY_OBJ) irq.o process.o ptrace.o \
 			   semaphore.o setup.o signal.o sys_arm.o time.o \
 			   traps.o $(O_OBJS_$(MACHINE))
 obj-m			:=
 obj-n			:=
 obj-			:=
 
-export-objs		:= armksyms.o dma.o ecard.o hw-footbridge.o hw-sa1100.o leds-$(MACHINE).o
+export-objs		:= armksyms.o dma.o ecard.o hw-footbridge.o \
+			   hw-sa1100.o leds-$(MACHINE).o oldlatches.o
 
-obj-$(CONFIG_ARCH_ACORN) += dma.o ecard.o fiq.o time-acorn.o
+obj-$(CONFIG_ARCH_ACORN) += ecard.o fiq.o time-acorn.o
 obj-$(CONFIG_DEBUG_LL)	+= debug-$(PROCESSOR).o
 obj-$(CONFIG_MODULES)	+= armksyms.o
 obj-$(CONFIG_LEDS)	+= leds-$(MACHINE).o
 obj-$(CONFIG_ARTHUR)	+= arthur.o
+obj-$(CONFIG_ISA_DMA)	+= dma-isa.o
 
 ifeq ($(MACHINE),nexuspci)
   obj-$(CONFIG_PCI)	+= plx9080.o