patch-2.3.4 linux/drivers/usb/Config.in

Next file: linux/drivers/usb/Makefile
Previous file: linux/drivers/sound/sound_core.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.3/linux/drivers/usb/Config.in linux/drivers/usb/Config.in
@@ -5,30 +5,31 @@
 # Right now hubs, mice and keyboards work - at least with UHCI.
 # But that may be more a lucky coincidence than anything else..
 #
-# This was all developed modularly, but I've been lazy in cleaning
-# it up, so right now they are all bools. 
-#
 mainmenu_option next_comment
 comment 'USB drivers - not for the faint of heart'
 
 tristate 'Support for USB (EXPERIMENTAL!)' CONFIG_USB
 if [ ! "$CONFIG_USB" = "n" ]; then
-  bool 'UHCI (intel PIIX4 and others) support?' CONFIG_USB_UHCI
+  dep_tristate 'UHCI (intel PIIX4 and others) support' CONFIG_USB_UHCI \
+	$CONFIG_USB
+    dep_tristate 'OHCI (compaq and some others) support' CONFIG_USB_OHCI \
+	$CONFIG_USB
 
-  bool 'OHCI (compaq and some others) support?' CONFIG_USB_OHCI
-  if [ "$CONFIG_USB_OHCI" = "y" ]; then
-     bool '  Enable tons of OHCI debugging output?' CONFIG_USB_OHCI_DEBUG
+  if [ "$CONFIG_USB_OHCI" != "n" ]; then
+     bool '  Enable tons of OHCI debugging output' CONFIG_USB_OHCI_DEBUG
   fi
-
-  bool 'OHCI-HCD (other OHCI opt. Virt. Root Hub) support?' CONFIG_USB_OHCI_HCD
-  if [ "$CONFIG_USB_OHCI_HCD" = "y" ]; then
-     bool 'OHCI-HCD Virtual Root Hub' CONFIG_USB_OHCI_VROOTHUB
+  dep_tristate 'OHCI-HCD (other OHCI opt. Virt. Root Hub) support' \
+		CONFIG_USB_OHCI_HCD $CONFIG_USB
+  if [ "$CONFIG_USB_OHCI_HCD" != "n" ]; then
+     	bool '  OHCI-HCD Virtual Root Hub' CONFIG_USB_OHCI_VROOTHUB
   fi
 
-  bool 'USB mouse support' CONFIG_USB_MOUSE
-  bool 'USB keyboard support' CONFIG_USB_KBD
-  bool 'USB audio parsing support' CONFIG_USB_AUDIO
-  bool 'USB Abstract Control Model support' CONFIG_USB_ACM
+  dep_tristate 'USB hub support' CONFIG_USB_HUB $CONFIG_USB
+  dep_tristate 'USB mouse support' CONFIG_USB_MOUSE $CONFIG_USB
+  dep_tristate 'USB keyboard support' CONFIG_USB_KBD $CONFIG_USB
+  dep_tristate 'USB audio parsing support' CONFIG_USB_AUDIO $CONFIG_USB
+  dep_tristate 'USB Abstract Control Model support' CONFIG_USB_ACM $CONFIG_USB
+  dep_tristate 'Preliminary USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
 fi
 
 endmenu

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)