USB

more file movement cleanups.  Now handles misc drivers compiled into
the kernel corectly.

diff --git a/drivers/usb/Config.in b/drivers/usb/Config.in
index 0da90ee53ac1b156db6359f89677f4361ffcbcfc..3df1907c5864214b92a68936b090a8583e42a926 100644 (file)
--- 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

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 039546f5d5d283f1d83abd25d617bec64babc895..e604711352e3ea18b4fefc33085d23341723d3d3 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -80,6 +80,8 @@ subdir-$(CONFIG_USB_RIO500)   += misc
 subdir-$(CONFIG_USB_TIGL)      += misc
 subdir-$(CONFIG_USB_USS720)    += misc
 subdir-$(CONFIG_USB_WACOM)     += misc
-
+ifeq ($(CONFIG_USB_MISC),y)
+       obj-y += misc/usb-misc.o
+endif
 
 include $(TOPDIR)/Rules.make

diff --git a/drivers/usb/core/Config.in b/drivers/usb/core/Config.in
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..023c2704c026bfbaccd0d4f5513a62edaeb54147 100644 (file)
--- a/drivers/usb/core/Config.in
+++ b/drivers/usb/core/Config.in
@@ -0,0 +1,14 @@
+#
+# USB Core configuration
+#
+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
+

diff --git a/drivers/usb/media/Config.in b/drivers/usb/media/Config.in
index ba2c075e7a537f848af8c863653a8b67606e47d6..bc295d7a740bff12458a040ca92da12ab411c1fa 100644 (file)
--- a/drivers/usb/media/Config.in
+++ b/drivers/usb/media/Config.in
@@ -12,7 +12,6 @@ else
    dep_tristate '  USB STV680 (Pencam) Camera support' CONFIG_USB_STV680 $CONFIG_USB $CONFIG_VIDEO_DEV     
    dep_tristate '  USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)' CONFIG_USB_VICAM $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
    dep_tristate '  D-Link USB FM radio support (EXPERIMENTAL)' CONFIG_USB_DSBR $CONFIG_USB $CONFIG_VIDEO_DEV $CONFIG_EXPERIMENTAL
-   dep_tristate '  DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
    dep_tristate '  USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
 fi
 
@@ -24,7 +23,7 @@ fi
 if [ "$CONFIG_USB_SE401" = "y" -o "$CONFIG_USB_STV680" = "y" -o "$CONFIG_USB_VICAM" = "y" ]; then
    define_bool CONFIG_USB_MEDIA y
 fi
-if [ "$CONFIG_USB_DSBR" = "y" -o "$CONFIG_USB_DABUSB" = "y" -o "$CONFIG_USB_KONICAWC" = "y" ]; then
+if [ "$CONFIG_USB_DSBR" = "y" -o "$CONFIG_USB_KONICAWC" = "y" ]; then
    define_bool CONFIG_USB_MEDIA y
 fi