patch-2.4.0-test5 linux/drivers/pcmcia/Config.in

• Lines: 31
• Date: Fri Jul 21 23:41:24 2000
• Orig file: v2.4.0-test4/linux/drivers/pcmcia/Config.in
• Orig date: Tue Jan 4 13:57:17 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/pcmcia/Config.in linux/drivers/pcmcia/Config.in
@@ -1,16 +1,24 @@
 #
 # PCMCIA bus subsystem configuration
 #
+# Right now the non-CardBus choices are not supported
+# by the integrated kernel driver.
+#
 mainmenu_option next_comment
 comment 'PCMCIA/CardBus support'
 
-tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
+dep_tristate 'CardBus support' CONFIG_PCMCIA $CONFIG_PCI
 if [ "$CONFIG_PCMCIA" != "n" ]; then
-   if [ "$CONFIG_PCI" != "n" ]; then
-      bool '  CardBus support' CONFIG_CARDBUS
-   fi
-   bool '  i82365 compatible bridge support' CONFIG_I82365
-   bool '  Databook TCIC host bridge support' CONFIG_TCIC
+  define_bool CONFIG_CARDBUS y
 fi
+
+#tristate 'PCMCIA/CardBus support' CONFIG_PCMCIA
+#if [ "$CONFIG_PCMCIA" != "n" ]; then
+#   if [ "$CONFIG_PCI" != "n" ]; then
+#      bool '  CardBus support' CONFIG_CARDBUS
+#   fi
+#   bool '  i82365 compatible bridge support' CONFIG_I82365
+#   bool '  Databook TCIC host bridge support' CONFIG_TCIC
+#fi
 
 endmenu