Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 11990b2b28dc6785c53c95b2a8f1d8605602a233

Authored by Russell King
1 parent 136b758bbb
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches 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

PCMCIA: make lubbock socket driver part of sa1111_cs 

Lubbock is just another SA1111 socket driver, so now that Kconfig has
better control of which files get built, we can sanitize the build
for this.

Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/pcmcia/Kconfig
Diff comments   View file @ 11990b2
... ... @@ -200,9 +200,9 @@
200 200  
201 201 config PCMCIA_SA1111
202 202 tristate "SA1111 support"
203   - depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA
  203 + depends on ARM && SA1111 && PCMCIA
204 204 select PCMCIA_SOC_COMMON
205   - select PCMCIA_SA11XX_BASE
  205 + select PCMCIA_SA11XX_BASE if ARCH_SA1100
206 206 help
207 207 Say Y here to include support for SA1111-based PCMCIA or CF
208 208 sockets, found on the Jornada 720, Graphicsmaster and other
... ... @@ -218,6 +218,7 @@
218 218 || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
219 219 || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
220 220 || MACH_COLIBRI320)
  221 + select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111
221 222 select PCMCIA_SOC_COMMON
222 223 help
223 224 Say Y here to include support for the PXA2xx PCMCIA controller
drivers/pcmcia/Makefile
Diff comments   View file @ 11990b2
... ... @@ -43,6 +43,7 @@
43 43 sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
44 44 sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
45 45 sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
  46 +sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock.o
46 47  
47 48 sa1100_cs-y += sa1100_generic.o
48 49 sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
49 50  
... ... @@ -53,9 +54,7 @@
53 54 sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
54 55 sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
55 56  
56   -pxa2xx_lubbock_cs-y += pxa2xx_lubbock.o sa1111_generic.o
57 57 pxa2xx_cm_x2xx_cs-y += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
58   -pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock_cs.o
59 58 pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
60 59 pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
61 60 pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx_cs.o