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

Next file: linux/drivers/usb/Makefile
Previous file: linux/drivers/usb/.indent.pro
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.33/linux/drivers/usb/Config.in linux/drivers/usb/Config.in
@@ -2,29 +2,20 @@
 # USB device configuration
 #
 mainmenu_option next_comment
-comment 'Support for USB'
+comment 'USB support'
 
 tristate 'Support for USB' CONFIG_USB
 if [ ! "$CONFIG_USB" = "n" ]; then
 comment 'USB Controllers'
    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
 
-   if [ "$CONFIG_USB_OHCI" != "n" ]; then
-      bool '    Enable tons of OHCI debugging output' CONFIG_USB_OHCI_DEBUG
-   fi
-   dep_tristate '  OHCI-HCD (other OHCI opt. Virt. Root Hub) support' \
+   dep_tristate '  OHCI-HCD (compaq and some others) 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
 
 comment 'Miscellaneous USB options'
-   bool '  Enable lots of ISOC debugging output' CONFIG_USB_DEBUG_ISOC
    if [ "$CONFIG_PROC_FS" != "n" ]; then
-      bool '  Preliminary /proc/bus/usb support' CONFIG_USB_PROC
+      bool '  /proc/bus/usb support' CONFIG_USB_PROC
    fi
    dep_tristate '  EZUSB Firmware downloader' CONFIG_USB_EZUSB $CONFIG_USB
 
@@ -43,6 +34,7 @@
       bool '    USB SCSI verbose debug' CONFIG_USB_SCSI_DEBUG
    fi
    dep_tristate '  USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
+   dep_tristate '  DABUSB driver' CONFIG_USB_DABUSB $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)