aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/Kconfig')
-rw-r--r--drivers/pcmcia/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index b7f3d2933fa0..bba3ab2066ee 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -200,9 +200,9 @@ config PCMCIA_SA1100
200 200
201config PCMCIA_SA1111 201config PCMCIA_SA1111
202 tristate "SA1111 support" 202 tristate "SA1111 support"
203 depends on ARM && ARCH_SA1100 && SA1111 && PCMCIA 203 depends on ARM && SA1111 && PCMCIA
204 select PCMCIA_SOC_COMMON 204 select PCMCIA_SOC_COMMON
205 select PCMCIA_SA11XX_BASE 205 select PCMCIA_SA11XX_BASE if ARCH_SA1100
206 help 206 help
207 Say Y here to include support for SA1111-based PCMCIA or CF 207 Say Y here to include support for SA1111-based PCMCIA or CF
208 sockets, found on the Jornada 720, Graphicsmaster and other 208 sockets, found on the Jornada 720, Graphicsmaster and other
@@ -218,6 +218,7 @@ config PCMCIA_PXA2XX
218 || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \ 218 || ARCOM_PCMCIA || ARCH_PXA_ESERIES || MACH_STARGATE2 \
219 || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \ 219 || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \
220 || MACH_COLIBRI320) 220 || MACH_COLIBRI320)
221 select PCMCIA_SA1111 if ARCH_LUBBOCK && SA1111
221 select PCMCIA_SOC_COMMON 222 select PCMCIA_SOC_COMMON
222 help 223 help
223 Say Y here to include support for the PXA2xx PCMCIA controller 224 Say Y here to include support for the PXA2xx PCMCIA controller