Merge commit 'v2.6.30-rc1' into core/urgent

[sfrench/cifs-2.6.git] / arch / arm / mach-netx / Makefile

diff --git a/arch/arm/mach-netx/Makefile b/arch/arm/mach-netx/Makefile
index cd424083e5b9847af2321b993292f827bc54c221..7ce4ba9eb242b1ec13855d918d625368d5d7220b 100644 (file)
--- a/arch/arm/mach-netx/Makefile
+++ b/arch/arm/mach-netx/Makefile
@@ -1,11 +1,12 @@
 #
 # Makefile for the linux kernel.
 #
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
 
 # Object file lists.
 
-obj-y                  += time.o generic.o pfifo.o
+obj-y                  += time.o generic.o pfifo.o xc.o
 
+# Specific board support
+obj-$(CONFIG_MACH_NXDKN) += nxdkn.o
+obj-$(CONFIG_MACH_NXDB500) += nxdb500.o fb.o
+obj-$(CONFIG_MACH_NXEB500HMI) += nxeb500hmi.o fb.o