Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index c0c77f82d051ee4ab8dcc910f4278e7458528f22..8d8852651fd2a7cc705877d661c1bcca90d2d545 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -2,9 +2,7 @@
 # PCCARD (PCMCIA/CardBus) bus subsystem configuration
 #
 
-menu "PCCARD (PCMCIA/CardBus) support"
-
-config PCCARD
+menuconfig PCCARD
        tristate "PCCard (PCMCIA/CardBus) support"
        depends on HOTPLUG
        ---help---
@@ -40,6 +38,7 @@ config PCMCIA_DEBUG
 config PCMCIA
        tristate "16-bit PCMCIA support"
        select CRC32
+       select HAVE_IDE
        default y
        ---help---
           This option enables support for 16-bit PCMCIA cards. Most older
@@ -221,6 +220,7 @@ config PCMCIA_SA1111
 config PCMCIA_PXA2XX
        tristate "PXA2xx support"
        depends on ARM && ARCH_PXA && PCMCIA
+       depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE
        help
          Say Y here to include support for the PXA2xx PCMCIA controller
 
@@ -271,6 +271,13 @@ config AT91_CF
          Say Y here to support the CompactFlash controller on AT91 chips.
          Or choose M to compile the driver as a module named "at91_cf".
 
+config ELECTRA_CF
+       tristate "Electra CompactFlash Controller"
+       depends on PCMCIA && PPC_PASEMI
+       help
+         Say Y here to support the CompactFlash controller on the
+         PA Semi Electra eval board.
+
 config PCCARD_NONSTATIC
        tristate
 
@@ -278,5 +285,3 @@ config PCCARD_IODYN
        bool
 
 endif  # PCCARD
-
-endmenu