Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 27c4cae28148ad97baa2bf8275f7ebc9e2c37c34

Authored by Russell King
Committed by Russell King
1 parent 4f788bb200
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] pxa: allow multi-machine PCMCIA builds 

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 11 additions and 9 deletions Side-by-side Diff

drivers/pcmcia/Makefile
Diff comments   View file @ 27c4cae
... ... @@ -29,7 +29,6 @@
29 29 obj-$(CONFIG_HD64465_PCMCIA) += hd64465_ss.o
30 30 obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_core.o sa1100_cs.o
31 31 obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_core.o sa1111_cs.o
32   -obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_core.o pxa2xx_cs.o
33 32 obj-$(CONFIG_M32R_PCC) += m32r_pcc.o
34 33 obj-$(CONFIG_M32R_CFC) += m32r_cfc.o
35 34 obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o
... ... @@ -68,12 +67,15 @@
68 67 sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
69 68 sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
70 69  
71   -pxa2xx_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o sa1111_generic.o
72   -pxa2xx_cs-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
73   -pxa2xx_cs-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
74   -pxa2xx_cs-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
75   -pxa2xx_cs-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o
76   -pxa2xx_cs-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o
77   -pxa2xx_cs-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o
78   -pxa2xx_cs-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o
  70 +pxa2xx_lubbock_cs-y += pxa2xx_lubbock.o sa1111_generic.o
  71 +pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock_cs.o
  72 +pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
  73 +pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
  74 +pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
  75 +pxa2xx-obj-$(CONFIG_ARCH_VIPER) += pxa2xx_viper.o
  76 +pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps.o
  77 +pxa2xx-obj-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o
  78 +pxa2xx-obj-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o
  79 +
  80 +obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_core.o $(pxa2xx-obj-y)