Merge branch 'pxa-palm' into pxa-machines

[linux-2.6-block.git] / drivers / pcmcia / Makefile

diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index c6d89fd3dcf4c5fed0284cdfd9181e36574cc6ea..679ca927a62a79507a0e7aba9cb995d3884a3e14 100644 (file)
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -71,7 +71,8 @@ sa1100_cs-$(CONFIG_SA1100_SIMPAD)             += sa1100_simpad.o
 pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK)               += pxa2xx_lubbock.o sa1111_generic.o
 pxa2xx_cs-$(CONFIG_MACH_MAINSTONE)             += pxa2xx_mainstone.o
 pxa2xx_cs-$(CONFIG_PXA_SHARPSL)                        += pxa2xx_sharpsl.o
-pxa2xx_cs-$(CONFIG_MACH_ARMCORE)               += pxa2xx_cm_x270.o
+pxa2xx_cs-$(CONFIG_MACH_ARMCORE)               += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA)             += pxa2xx_trizeps.o
 pxa2xx_cs-$(CONFIG_MACH_PALMTX)                        += pxa2xx_palmtx.o
 pxa2xx_cs-$(CONFIG_MACH_PALMLD)                        += pxa2xx_palmld.o