Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-beck.git] / drivers / pcmcia / Kconfig

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index 51cf8083b29928044018e528e32b86053ee59cbb..b0ce7cdee0c23e4a737ed0fb69601586fa5f2f4e 100644 (file)
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -144,16 +144,6 @@ config TCIC
          "Bridge" is the name used for the hardware inside your computer that
          PCMCIA cards are plugged into. If unsure, say N.
 
-config PCMCIA_M8XX
-       tristate "MPC8xx PCMCIA support"
-       depends on PCCARD && PPC && 8xx
-       select PCCARD_IODYN if PCMCIA != n
-       help
-         Say Y here to include support for PowerPC 8xx series PCMCIA
-         controller.
-
-         This driver is also available as a module called m8xx_pcmcia.
-
 config PCMCIA_ALCHEMY_DEVBOARD
        tristate "Alchemy Db/Pb1xxx PCMCIA socket services"
        depends on MIPS_ALCHEMY && PCMCIA