X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpcmcia%2FKconfig;h=1b0eb5aaf650738a57300890941136d33ec06c62;hb=b0afffe89be619f42ae4215554ed66e67de7bb0e;hp=ed8c06904807723540365699e892cacf68cc7a71;hpb=d1964dab60ce7c104dd21590e987a8787db18051;p=linux-2.6

diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index ed8c069048..1b0eb5aaf6 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -38,7 +38,6 @@ 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
@@ -200,7 +199,6 @@ config PCMCIA_AU1X00
 config PCMCIA_SA1100
 	tristate "SA1100 support"
 	depends on ARM && ARCH_SA1100 && PCMCIA
-	depends on ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL || MACH_ARMCORE
 	help
 	  Say Y here to include support for SA11x0-based PCMCIA or CF
 	  sockets, found on HP iPAQs, Yopy, and other StrongARM(R)/
@@ -221,6 +219,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