summaryrefslogtreecommitdiff
path: root/drivers/usb/Config.in
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2002-04-04 08:18:18 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2002-04-04 08:18:18 -0800
commit03943afd2cede3e02cd89fbb3cb518692e4a77be (patch)
tree54cfad607c3c26694db9b4b85911ea9514c41ce5 /drivers/usb/Config.in
parent037bf3e14dbba31874d9dcc316bd9f808645a0d7 (diff)
USB
more file movement cleanups. Now handles misc drivers compiled into the kernel corectly.
Diffstat (limited to 'drivers/usb/Config.in')
-rw-r--r--drivers/usb/Config.in25
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/usb/Config.in b/drivers/usb/Config.in
index 0da90ee53ac1..3df1907c5864 100644
--- a/drivers/usb/Config.in
+++ b/drivers/usb/Config.in
@@ -6,16 +6,7 @@ comment 'USB support'
dep_tristate 'Support for USB' CONFIG_USB $CONFIG_PCI
if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
- bool ' USB verbose debug messages' CONFIG_USB_DEBUG
-
- comment 'Miscellaneous USB options'
- bool ' USB device filesystem' CONFIG_USB_DEVICEFS
- if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- bool ' Enforce USB bandwidth allocation (EXPERIMENTAL)' CONFIG_USB_BANDWIDTH
- else
- define_bool CONFIG_USB_BANDWIDTH n
- fi
- bool ' Long timeout for slow-responding devices (some MGE Ellipse UPSes)' CONFIG_USB_LONG_TIMEOUT
+ source drivers/usb/core/Config.in
source drivers/usb/host/Config.in
@@ -38,5 +29,19 @@ if [ "$CONFIG_USB" = "y" -o "$CONFIG_USB" = "m" ]; then
dep_tristate ' USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' USB Auerswald ISDN support (EXPERIMENTAL)' CONFIG_USB_AUERSWALD $CONFIG_USB $CONFIG_EXPERIMENTAL
dep_tristate ' Texas Instruments Graph Link USB (aka SilverLink) cable support' CONFIG_USB_TIGL $CONFIG_USB
+ dep_tristate ' DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
+
+ # Turn on CONFIG_USB_MISC if any of the drivers are compiled into the kernel
+ # to make our Makefile logic a bit simpler
+ if [ "$CONFIG_USB_USS720" = "y" -o "$CONFIG_USB_EMI26" = "y" -o "$CONFIG_USB_RIO500" = "y" ]; then
+ define_bool CONFIG_USB_MISC y
+ fi
+ if [ "$CONFIG_USB_AUERSWALD" = "y" -o "$CONFIG_USB_TIGL" = "y" -o "$CONFIG_USB_DABUSB" = "y" ]; then
+ define_bool CONFIG_USB_MISC y
+ fi
+ if [ "$CONFIG_USB_WACOM" = "y" ]; then
+ define_bool CONFIG_USB_MISC y
+ fi
+
fi
endmenu