vserver 1.9.5.x5

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

diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 991c219..07a56ff 100644 (file)
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR)
+AFLAGS_head.o := -DTEXTADDR=$(TEXTADDR) -DDATAADDR=$(DATAADDR)
 
 # Object file lists.
 
@@ -11,14 +11,17 @@ obj-y               := arch.o compat.o dma.o entry-armv.o entry-common.o irq.o   \
                   time.o traps.o
 
 obj-$(CONFIG_APM)              += apm.o
-obj-$(CONFIG_ARCH_ACORN)       += ecard.o time-acorn.o
-obj-$(CONFIG_ARCH_CLPS7500)    += time-acorn.o
+obj-$(CONFIG_ARCH_ACORN)       += ecard.o 
 obj-$(CONFIG_FOOTBRIDGE)       += isa.o
 obj-$(CONFIG_FIQ)              += fiq.o
 obj-$(CONFIG_MODULES)          += armksyms.o module.o
 obj-$(CONFIG_ARTHUR)           += arthur.o
 obj-$(CONFIG_ISA_DMA)          += dma-isa.o
 obj-$(CONFIG_PCI)              += bios32.o
+obj-$(CONFIG_SMP)              += smp.o
+
+obj-$(CONFIG_IWMMXT)           += iwmmxt.o
+AFLAGS_iwmmxt.o                        := -Wa,-mcpu=iwmmxt
 
 ifneq ($(CONFIG_ARCH_EBSA110),y)
   obj-y                += io.o
@@ -27,7 +30,7 @@ endif
 head-y                 := head.o
 obj-$(CONFIG_DEBUG_LL) += debug.o
 
-extra-y := $(head-y) init_task.o vmlinux.lds.s
+extra-y := $(head-y) init_task.o vmlinux.lds
 
 # Spell out some dependencies that aren't automatically figured out
 $(obj)/entry-armv.o:   $(obj)/entry-header.S include/asm-arm/constants.h