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>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index b7f3d2933fa..bba3ab2066e 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -200,9 +200,9 @@ config PCMCIA_SA1100
 
 config PCMCIA_SA1111
         tristate "SA1111 support"
-        depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA
+        depends on ARM && SA1111 && PCMCIA
         select PCMCIA_SOC_COMMON
-        select PCMCIA_SA11XX_BASE
+        select PCMCIA_SA11XX_BASE if ARCH_SA1100
         help
           Say Y  here to include support for SA1111-based PCMCIA or CF
           sockets, found on the Jornada 720, Graphicsmaster and other
@@ -218,6 +218,7 @@ config PCMCIA_PXA2XX
                     || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
                     || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
                     || MACH_COLIBRI320)
+        select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111
         select PCMCIA_SOC_COMMON
         help
           Say Y here to include support for the PXA2xx PCMCIA controller