Merge with Linux 2.2.1.

1 files changed, 32 insertions, 22 deletions

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 542ca995a..23b2c1267 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -10,44 +10,54 @@ ENTRY_OBJ = entry-$(PROCESSOR).o
 
 O_TARGET := kernel.o
 O_OBJS   := $(ENTRY_OBJ) ioport.o irq.o process.o ptrace.o setup.o \
-	    signal.o sys_arm.o time.o traps.o fiq.o
+	    signal.o sys_arm.o time.o traps.o
+
+DMA_OBJS_arc      = dma-arc.o
+DMA_OBJS_a5k      = dma-a5k.o
+DMA_OBJS_rpc      = dma-rpc.o
+DMA_OBJS_ebsa110  = dma-dummy.o
+DMA_OBJS_ebsa285  = dma-ebsa285.o
+DMA_OBJS_nexuspci =
+DMA_OBJS_vnc      = dma-vnc.o
+
+O_OBJS_arc        = ecard.o iic.o fiq.o oldlatches.o
+O_OBJS_a5k        = ecard.o iic.o fiq.o
+O_OBJS_rpc        = ecard.o iic.o fiq.o
+O_OBJS_ebsa110    = leds-ebsa110.o
+O_OBJS_ebsa285    = leds-ebsa285.o hw-ebsa285.o
+O_OBJS_nexuspci   =
+O_OBJS_vnc        = leds-ebsa285.o hw-vnc.o
 
 all: lib kernel.o $(HEAD_OBJ) init_task.o
 
 ifeq ($(CONFIG_MODULES),y)
-OX_OBJS = armksyms.o
+  OX_OBJS = armksyms.o
 else
-O_OBJS += armksyms.o
+  O_OBJS += armksyms.o
 endif
 
-ifdef CONFIG_ARCH_ACORN
-  O_OBJS += ecard.o iic.o
-  ifdef CONFIG_ARCH_ARC
-    O_OBJS += oldlatches.o
+ifeq ($(MACHINE),nexuspci)
+  ifdef CONFIG_PCI
+    O_OBJS += plx9080.o
   endif
-  O_OBJS += dma-$(MACHINE).o
-  OX_OBJS += dma.o
-endif
-
-ifeq ($(MACHINE),ebsa110)
-  O_OBJS += dma-dummy.o leds-ebsa110.o
-endif
-
-ifeq ($(MACHINE),ebsa285)
-  OX_OBJS += dma.o
-  O_OBJS += dma-ebsa285.o leds-ebsa285.o
+else
   ifdef CONFIG_PCI
     O_OBJS += dec21285.o
   endif
 endif
 
-ifeq ($(MACHINE),nexuspci)
-  O_OBJS += dma-dummy.o
-  ifdef CONFIG_PCI
-    O_OBJS += plx9080.o
+ifneq ($(DMA_OBJS_$(MACHINE)),)
+  OX_OBJS += dma.o
+  O_OBJS  += $(DMA_OBJS_$(MACHINE))
+  ifeq ($(CONFIG_ISA_DMA),y)
+    O_OBJS += dma-isa.o
   endif
+else
+  O_OBJS += dma-dummy.o
 endif
 
+O_OBJS += $(O_OBJS_$(MACHINE))
+
 $(HEAD_OBJ): $(HEAD_OBJ:.o=.S)
 	$(CC) -D__ASSEMBLY__ -DTEXTADDR=$(TEXTADDR) -traditional -c $(HEAD_OBJ:.o=.S) -o $@