[ARM] pxa: allow multi-machine PCMCIA builds
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:16:33 +0000 (19:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:16:33 +0000 (19:16 +0100)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/pcmcia/Makefile

index 8c2fe94122a2b6b612920f62a533ba668b9c8f39..a87902de8d3b9ec187b66a69c9ea97931577c504 100644 (file)
@@ -29,7 +29,6 @@ obj-$(CONFIG_PCMCIA_M8XX)                     += m8xx_pcmcia.o
 obj-$(CONFIG_HD64465_PCMCIA)                   += hd64465_ss.o
 obj-$(CONFIG_PCMCIA_SA1100)                    += sa11xx_core.o sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                    += sa11xx_core.o sa1111_cs.o
-obj-$(CONFIG_PCMCIA_PXA2XX)                     += pxa2xx_core.o pxa2xx_cs.o
 obj-$(CONFIG_M32R_PCC)                         += m32r_pcc.o
 obj-$(CONFIG_M32R_CFC)                         += m32r_cfc.o
 obj-$(CONFIG_PCMCIA_AU1X00)                    += au1x00_ss.o
@@ -68,11 +67,14 @@ sa1100_cs-$(CONFIG_SA1100_H3600)            += sa1100_h3600.o
 sa1100_cs-$(CONFIG_SA1100_SHANNON)             += sa1100_shannon.o
 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_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
-pxa2xx_cs-$(CONFIG_ARCH_VIPER)                 += pxa2xx_viper.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
+pxa2xx_lubbock_cs-y                            += pxa2xx_lubbock.o sa1111_generic.o
+pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK)              += pxa2xx_lubbock_cs.o
+pxa2xx-obj-$(CONFIG_MACH_MAINSTONE)            += pxa2xx_mainstone.o
+pxa2xx-obj-$(CONFIG_PXA_SHARPSL)               += pxa2xx_sharpsl.o
+pxa2xx-obj-$(CONFIG_MACH_ARMCORE)              += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
+pxa2xx-obj-$(CONFIG_ARCH_VIPER)                        += pxa2xx_viper.o
+pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA)            += pxa2xx_trizeps.o
+pxa2xx-obj-$(CONFIG_MACH_PALMTX)               += pxa2xx_palmtx.o
+pxa2xx-obj-$(CONFIG_MACH_PALMLD)               += pxa2xx_palmld.o
+
+obj-$(CONFIG_PCMCIA_PXA2XX)                    += pxa2xx_core.o $(pxa2xx-obj-y)