Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / arm / mach-w90x900 / Makefile

diff --git a/arch/arm/mach-w90x900/Makefile b/arch/arm/mach-w90x900/Makefile
index d50c94f..828c032 100644 (file)
--- a/arch/arm/mach-w90x900/Makefile
+++ b/arch/arm/mach-w90x900/Makefile
@@ -4,12 +4,16 @@
 
 # Object file lists.
 
-obj-y                          := irq.o time.o mfp-w90p910.o gpio.o clock.o
-
+obj-y                          := irq.o time.o mfp.o gpio.o clock.o
+obj-y                          += clksel.o dev.o cpu.o
 # W90X900 CPU support files
 
-obj-$(CONFIG_CPU_W90P910)      += w90p910.o
+obj-$(CONFIG_CPU_W90P910)      += nuc910.o
+obj-$(CONFIG_CPU_NUC950)       += nuc950.o
+obj-$(CONFIG_CPU_NUC960)       += nuc960.o
 
 # machine support
 
-obj-$(CONFIG_MACH_W90P910EVB)  += mach-w90p910evb.o
+obj-$(CONFIG_MACH_W90P910EVB)  += mach-nuc910evb.o
+obj-$(CONFIG_MACH_W90P950EVB)  += mach-nuc950evb.o
+obj-$(CONFIG_MACH_W90N960EVB)  += mach-nuc960evb.o