Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / Makefile

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index bfdd0c5fcd7a1703e2706e30cb5203e734e20b30..4263527e5123eca682756576dce3c60368b62179 100644 (file)
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -29,6 +29,8 @@ ifeq ($(CONFIG_MACH_ZYLONITE),y)
   obj-$(CONFIG_CPU_PXA320)     += zylonite_pxa320.o
 endif
 
+obj-$(CONFIG_MACH_ARMCORE)      += cm-x270.o
+
 # Support for blinky lights
 led-y := leds.o
 led-$(CONFIG_ARCH_LUBBOCK)     += leds-lubbock.o
@@ -45,3 +47,7 @@ obj-$(CONFIG_PXA_SSP)         += ssp.o
 ifeq ($(CONFIG_PXA27x),y)
 obj-$(CONFIG_PM)               += standby.o
 endif
+
+ifeq ($(CONFIG_PCI),y)
+obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o
+endif