USB

moved class/storage/ back to storage/
created input/
orderd the makefiles and config.in menus better.

54 files changed, 142 insertions, 120 deletions

diff --git a/drivers/usb/Config.in b/drivers/usb/Config.in
index 3df1907c5864..f645d9f7e51c 100644
--- a/drivers/usb/Config.in
+++ b/drivers/usb/Config.in
@@ -12,7 +12,9 @@ if [ "$CONFIG_USB" = "y" -o  "$CONFIG_USB" = "m" ]; then
 
    source drivers/usb/class/Config.in
 
-   dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
+   source drivers/usb/storage/Config.in
+
+   source drivers/usb/input/Config.in
  
    source drivers/usb/image/Config.in
 
@@ -22,24 +24,21 @@ if [ "$CONFIG_USB" = "y" -o  "$CONFIG_USB" = "m" ]; then
 
    comment 'USB port drivers'
    dep_tristate '  USS720 parport driver' CONFIG_USB_USS720 $CONFIG_USB $CONFIG_PARPORT
+
    source drivers/usb/serial/Config.in
 
    comment 'USB Miscellaneous drivers'
    dep_tristate '  EMI 2|6 USB Audio interface support' CONFIG_USB_EMI26 $CONFIG_USB_AUDIO
-   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
+   dep_tristate '  USB Auerswald ISDN support (EXPERIMENTAL)' CONFIG_USB_AUERSWALD $CONFIG_USB $CONFIG_EXPERIMENTAL
+   dep_tristate '  USB Diamond Rio500 support (EXPERIMENTAL)' CONFIG_USB_RIO500 $CONFIG_USB $CONFIG_EXPERIMENTAL
 
    # 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
+   if [ "$CONFIG_USB_AUERSWALD" = "y" -o "$CONFIG_USB_TIGL" = "y" ]; then
       define_bool CONFIG_USB_MISC y
    fi
 
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index e604711352e3..4da8be9f8759 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -5,7 +5,7 @@
 O_TARGET	:= usbdrv.o
 
 # Object files in subdirectories
-mod-subdirs	:= core host class media net serial image misc
+mod-subdirs	:= core host class media net serial storage image misc input
 
 subdir-$(CONFIG_USB)		+= core
 ifeq ($(CONFIG_USB),y)
@@ -14,9 +14,9 @@ endif
 
 subdir-$(CONFIG_USB_EHCI_HCD)	+= host
 subdir-$(CONFIG_USB_OHCI_HCD)	+= host
-subdir-$(CONFIG_USB_UHCI)	+= host
-subdir-$(CONFIG_USB_UHCI_ALT)	+= host
 subdir-$(CONFIG_USB_OHCI)	+= host
+subdir-$(CONFIG_USB_UHCI_ALT)	+= host
+subdir-$(CONFIG_USB_UHCI)	+= host
 ifeq ($(CONFIG_USB_HOST),y)
 	obj-y += host/usb-host.o
 endif
@@ -24,45 +24,51 @@ endif
 subdir-$(CONFIG_USB_ACM)	+= class
 subdir-$(CONFIG_USB_AUDIO)	+= class
 subdir-$(CONFIG_USB_BLUETOOTH)	+= class
-subdir-$(CONFIG_USB_CDCETHER)	+= class
-subdir-$(CONFIG_USB_HID)	+= class
-subdir-$(CONFIG_USB_KBD)	+= class
-subdir-$(CONFIG_USB_MOUSE)	+= class
 subdir-$(CONFIG_USB_PRINTER)	+= class
 ifeq ($(CONFIG_USB_CLASS),y)
 	obj-y += class/usb-class.o
 endif
 
-subdir-$(CONFIG_USB_STORAGE)	+= class/storage
+subdir-$(CONFIG_USB_STORAGE)	+= storage
 ifeq ($(CONFIG_USB_STORAGE),y)
-	obj-y += class/storage/storage.o
+	obj-y += storage/storage.o
 endif
 
+subdir-$(CONFIG_USB_HID)	+= input
+subdir-$(CONFIG_USB_KBD)	+= input
+subdir-$(CONFIG_USB_MOUSE)	+= input
+subdir-$(CONFIG_USB_WACOM)	+= input
+ifeq ($(CONFIG_USB_INPUT),y)
+	obj-y += input/usb-input.o
+endif
+
+subdir-$(CONFIG_USB_DABUSB)	+= media
+subdir-$(CONFIG_USB_DSBR)	+= media
 subdir-$(CONFIG_USB_IBMCAM)	+= media
 subdir-$(CONFIG_USB_KONICAWC)	+= media
-subdir-$(CONFIG_USB_PWC)	+= media
-subdir-$(CONFIG_USB_VICAM)	+= media
 subdir-$(CONFIG_USB_OV511)	+= media
+subdir-$(CONFIG_USB_PWC)	+= media
 subdir-$(CONFIG_USB_SE401)	+= media
 subdir-$(CONFIG_USB_STV680)	+= media
-subdir-$(CONFIG_USB_DSBR)	+= media
+subdir-$(CONFIG_USB_VICAM)	+= media
 ifeq ($(CONFIG_USB_MEDIA),y)
 	obj-y += media/usb-media.o
 endif
 
-subdir-$(CONFIG_USB_PEGASUS)	+= net
-subdir-$(CONFIG_USB_RTL8150)	+= net
 subdir-$(CONFIG_USB_CATC)	+= net
+subdir-$(CONFIG_USB_CDCETHER)	+= net
 subdir-$(CONFIG_USB_KAWETH)	+= net
+subdir-$(CONFIG_USB_PEGASUS)	+= net
+subdir-$(CONFIG_USB_RTL8150)	+= net
 subdir-$(CONFIG_USB_USBNET)	+= net
 ifeq ($(CONFIG_USB_NET),y)
 	obj-y += net/usb-net.o
 endif
 
 subdir-$(CONFIG_USB_DC2XX)	+= image
+subdir-$(CONFIG_USB_HPUSBSCSI)	+= image
 subdir-$(CONFIG_USB_MDC800)	+= image
 subdir-$(CONFIG_USB_MICROTEK)	+= image
-subdir-$(CONFIG_USB_HPUSBSCSI)	+= image
 subdir-$(CONFIG_USB_SCANNER)	+= image
 ifeq ($(CONFIG_USB_IMAGE),y)
 	obj-y += image/usb-image.o
@@ -74,12 +80,10 @@ ifeq ($(CONFIG_USB_SERIAL),y)
 endif
 
 subdir-$(CONFIG_USB_AUERSWALD)	+= misc
-subdir-$(CONFIG_USB_DABUSB)	+= misc
 subdir-$(CONFIG_USB_EMI26)	+= misc
 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
diff --git a/drivers/usb/class/Config.in b/drivers/usb/class/Config.in
index 4f607b443e8e..94fedd1f9c30 100644
--- a/drivers/usb/class/Config.in
+++ b/drivers/usb/class/Config.in
@@ -4,44 +4,16 @@
 comment 'USB Device Class drivers'
 dep_tristate '  USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
 dep_tristate '  USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH $CONFIG_USB $CONFIG_EXPERIMENTAL
-if [ "$CONFIG_SCSI" = "n" ]; then
-   comment '  SCSI support is needed for USB Storage'
-fi
-dep_tristate '  USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
-   dep_mbool '    USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG $CONFIG_USB_STORAGE
-   dep_mbool '    Datafab MDCFE-B Compact Flash Reader support' CONFIG_USB_STORAGE_DATAFAB $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
-   dep_mbool '    Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM  $CONFIG_USB_STORAGE
-   dep_mbool '    ISD-200 USB/ATA Bridge support' CONFIG_USB_STORAGE_ISD200 $CONFIG_USB_STORAGE
-   dep_mbool '    Microtech CompactFlash/SmartMedia support' CONFIG_USB_STORAGE_DPCM $CONFIG_USB_STORAGE
-   dep_mbool '    HP CD-Writer 82xx support' CONFIG_USB_STORAGE_HP8200e $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
-   dep_mbool '    SanDisk SDDR-09 (and other SmartMedia) support' CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
-   dep_mbool '    Lexar Jumpshot Compact Flash Reader' CONFIG_USB_STORAGE_JUMPSHOT $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
-   dep_tristate '  USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
-   dep_tristate '  USB CDC Ethernet support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
-   dep_tristate '  USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
-
-comment 'USB Human Interface Devices (HID)'
-dep_tristate '  USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB
-if [ "$CONFIG_INPUT" = "n" ]; then
-   comment '    Input core support is needed for USB HID input layer or HIDBP support'
-fi
-dep_mbool '    HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID
-dep_mbool '    /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID
+dep_tristate '  USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
+dep_tristate '  USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
 
-if [ "$CONFIG_USB_HID" != "y" ]; then
-   dep_tristate '  USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
-   dep_tristate '  USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
-fi
 
 # Turn on CONFIG_USB_CLASS if any of the drivers are compiled into the kernel
 # to make our Makefile logic a bit simpler.
-if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH" = "y" -o "$CONFIG_USB_ACM" = "y" ]; then
-   define_bool CONFIG_USB_CLASS y
-fi
-if [ "$CONFIG_USB_CDCETHER" = "y" -o "$CONFIG_USB_PRINTER" = "y" ]; then
+if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH" = "y" ]; then
    define_bool CONFIG_USB_CLASS y
 fi
-if [ "$CONFIG_USB_HID" = "y" -o "$CONFIG_USB_KBD" = "y" -o "$CONFIG_USB_MOUSE" = "y" ]; then
+if [ "$CONFIG_USB_ACM" = "y" -o "$CONFIG_USB_PRINTER" = "y" ]; then
    define_bool CONFIG_USB_CLASS y
 fi
    
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile
index da255cfc23fd..53443b76f9ef 100644
--- a/drivers/usb/class/Makefile
+++ b/drivers/usb/class/Makefile
@@ -1,28 +1,13 @@
 #
 # Makefile for USB Class drivers
+# (one step up from the misc category)
 #
 
 O_TARGET	:= usb-class.o
 
-# Multipart objects.
-hid-objs	:= hid-core.o
-
-# Optional parts of multipart objects.
-ifeq ($(CONFIG_USB_HIDDEV),y)
-	hid-objs        += hiddev.o
-endif
-ifeq ($(CONFIG_USB_HIDINPUT),y)
-	hid-objs        += hid-input.o
-endif
-                 
-
 obj-$(CONFIG_USB_ACM)		+= cdc-acm.o
 obj-$(CONFIG_USB_AUDIO)		+= audio.o
 obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
-obj-$(CONFIG_USB_CDCETHER)	+= cdc-ether.o
-obj-$(CONFIG_USB_HID)		+= hid.o
-obj-$(CONFIG_USB_KBD)		+= usbkbd.o
-obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
 obj-$(CONFIG_USB_PRINTER)	+= printer.o
 
 
diff --git a/drivers/usb/class/storage/Makefile b/drivers/usb/class/storage/Makefile
deleted file mode 100644
index 0181d2e727ca..000000000000
--- a/drivers/usb/class/storage/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Makefile for the USB Mass Storage device drivers.
-#
-# 15 Aug 2000, Christoph Hellwig <hch@infradead.org>
-# Rewritten to use lists instead of if-statements.
-#
-
-O_TARGET	:= storage.o
-EXTRA_CFLAGS	:= -I../../../scsi/
-
-list-multi	:= usb-storage.o
-
-obj-$(CONFIG_USB_STORAGE)			+= usb-storage.o
-
-usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG)	+= debug.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_HP8200e)	+= shuttle_usbat.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_SDDR09)	+= sddr09.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_FREECOM)	+= freecom.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_SMARTMEDIA)   += shuttle_sm.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_COMPACTFLASH) += shuttle_cf.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM)	+= dpcm.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200)	+= isd200.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB)   += datafab.o
-usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)  += jumpshot.o
-
-usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \
-			initializers.o $(usb-storage-obj-y)
-
-include $(TOPDIR)/Rules.make
-
-usb-storage.o: $(usb-storage-objs)
-	$(LD) -r -o $@ $(usb-storage-objs)
diff --git a/drivers/usb/input/Config.in b/drivers/usb/input/Config.in
new file mode 100644
index 000000000000..67367dec98b6
--- /dev/null
+++ b/drivers/usb/input/Config.in
@@ -0,0 +1,27 @@
+#
+# USB Input driver configuration
+#
+comment 'USB Human Interface Devices (HID)'
+dep_tristate '  USB Human Interface Device (full HID) support' CONFIG_USB_HID $CONFIG_USB
+if [ "$CONFIG_INPUT" = "n" ]; then
+   comment '    Input core support is needed for USB HID input layer or HIDBP support'
+fi
+dep_mbool '    HID input layer support' CONFIG_USB_HIDINPUT $CONFIG_INPUT $CONFIG_USB_HID
+dep_mbool '    /dev/hiddev raw HID device support' CONFIG_USB_HIDDEV $CONFIG_USB_HID
+
+if [ "$CONFIG_USB_HID" != "y" ]; then
+   dep_tristate '  USB HIDBP Keyboard (basic) support' CONFIG_USB_KBD $CONFIG_USB $CONFIG_INPUT
+   dep_tristate '  USB HIDBP Mouse (basic) support' CONFIG_USB_MOUSE $CONFIG_USB $CONFIG_INPUT
+fi
+
+dep_tristate '  Wacom Intuos/Graphire tablet support' CONFIG_USB_WACOM $CONFIG_USB $CONFIG_INPUT
+
+# Turn on CONFIG_USB_INPUT if any of the drivers are compiled into the kernel
+# to make our Makefile logic a bit simpler.
+if [ "$CONFIG_USB_HID" = "y" -o "$CONFIG_USB_KBD" = "y" -o "$CONFIG_USB_MOUSE" = "y" ]; then
+   define_bool CONFIG_USB_INPUT y
+fi
+if [ "$CONFIG_USB_WACOM" = "y" ]; then
+   define_bool CONFIG_USB_INPUT y
+fi
+   
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
new file mode 100644
index 000000000000..ae662a4d44dc
--- /dev/null
+++ b/drivers/usb/input/Makefile
@@ -0,0 +1,24 @@
+#
+# Makefile for the USB input drivers
+#
+
+O_TARGET	:= usb-input.o
+
+# Multipart objects.
+hid-objs	:= hid-core.o
+
+# Optional parts of multipart objects.
+ifeq ($(CONFIG_USB_HIDDEV),y)
+	hid-objs        += hiddev.o
+endif
+ifeq ($(CONFIG_USB_HIDINPUT),y)
+	hid-objs        += hid-input.o
+endif
+
+obj-$(CONFIG_USB_HID)		+= hid.o
+obj-$(CONFIG_USB_KBD)		+= usbkbd.o
+obj-$(CONFIG_USB_MOUSE)		+= usbmouse.o
+obj-$(CONFIG_USB_WACOM)		+= wacom.o
+
+
+include $(TOPDIR)/Rules.make
diff --git a/drivers/usb/class/hid-core.c b/drivers/usb/input/hid-core.c
index 245ad1a0b5af..245ad1a0b5af 100644
--- a/drivers/usb/class/hid-core.c
+++ b/drivers/usb/input/hid-core.c
diff --git a/drivers/usb/class/hid-debug.h b/drivers/usb/input/hid-debug.h
index ba2f9ef54937..ba2f9ef54937 100644
--- a/drivers/usb/class/hid-debug.h
+++ b/drivers/usb/input/hid-debug.h
diff --git a/drivers/usb/class/hid-input.c b/drivers/usb/input/hid-input.c
index b45938b18cc8..b45938b18cc8 100644
--- a/drivers/usb/class/hid-input.c
+++ b/drivers/usb/input/hid-input.c
diff --git a/drivers/usb/class/hid.h b/drivers/usb/input/hid.h
index 357e31bd3814..357e31bd3814 100644
--- a/drivers/usb/class/hid.h
+++ b/drivers/usb/input/hid.h
diff --git a/drivers/usb/class/hiddev.c b/drivers/usb/input/hiddev.c
index 206531c7aef7..206531c7aef7 100644
--- a/drivers/usb/class/hiddev.c
+++ b/drivers/usb/input/hiddev.c
diff --git a/drivers/usb/class/usbkbd.c b/drivers/usb/input/usbkbd.c
index 31edd4e7b52b..31edd4e7b52b 100644
--- a/drivers/usb/class/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
diff --git a/drivers/usb/class/usbmouse.c b/drivers/usb/input/usbmouse.c
index 22673b42d60a..22673b42d60a 100644
--- a/drivers/usb/class/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
diff --git a/drivers/usb/misc/wacom.c b/drivers/usb/input/wacom.c
index 74bfb073e78d..74bfb073e78d 100644
--- a/drivers/usb/misc/wacom.c
+++ b/drivers/usb/input/wacom.c
diff --git a/drivers/usb/media/Config.in b/drivers/usb/media/Config.in
index bc295d7a740b..7e724ba62def 100644
--- a/drivers/usb/media/Config.in
+++ b/drivers/usb/media/Config.in
@@ -2,18 +2,18 @@
 # USB Multimedia device configuration
 #
 comment 'USB Multimedia devices'
+dep_tristate '  DABUSB driver' CONFIG_USB_DABUSB $CONFIG_USB
 if [ "$CONFIG_VIDEO_DEV" = "n" ]; then
    comment '  Video4Linux support is needed for USB Multimedia device support'
-else
-   dep_tristate '  USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM $CONFIG_USB $CONFIG_VIDEO_DEV
-   dep_tristate '  USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
-   dep_tristate '  USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
-   dep_tristate '  USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
-   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 '  USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
 fi
+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 '  USB IBM (Xirlink) C-it Camera support' CONFIG_USB_IBMCAM $CONFIG_USB $CONFIG_VIDEO_DEV
+dep_tristate '  USB Konica Webcam support' CONFIG_USB_KONICAWC $CONFIG_USB $CONFIG_VIDEO_DEV
+dep_tristate '  USB OV511 Camera support' CONFIG_USB_OV511 $CONFIG_USB $CONFIG_VIDEO_DEV
+dep_tristate '  USB Philips Cameras' CONFIG_USB_PWC $CONFIG_USB $CONFIG_VIDEO_DEV
+dep_tristate '  USB SE401 Camera support' CONFIG_USB_SE401 $CONFIG_USB $CONFIG_VIDEO_DEV
+dep_tristate '  USB STV680 (Pencam) Camera support' CONFIG_USB_STV680 $CONFIG_USB $CONFIG_VIDEO_DEV     
 
 # Turn on CONFIG_USB_MEDIA if any of the drivers are compiled into the kernel
 # to make our Makefile logic a bit simpler
@@ -23,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_KONICAWC" = "y" ]; then
+if [ "$CONFIG_USB_DSBR" = "y" -o "$CONFIG_USB_KONICAWC" = "y" -o "$CONFIG_USB_DABUSB" = "y" ]; then
    define_bool CONFIG_USB_MEDIA y
 fi
 
diff --git a/drivers/usb/media/Makefile b/drivers/usb/media/Makefile
index 836d566dda91..0e655532e694 100644
--- a/drivers/usb/media/Makefile
+++ b/drivers/usb/media/Makefile
@@ -8,6 +8,7 @@ export-objs	:= ov511.o pwc-uncompress.o
 
 pwc-objs	:= pwc-if.o pwc-misc.o pwc-ctrl.o pwc-uncompress.o
 
+obj-$(CONFIG_USB_DABUSB)	+= dabusb.o
 obj-$(CONFIG_USB_DSBR)		+= dsbr100.o
 obj-$(CONFIG_USB_IBMCAM)	+= ibmcam.o usbvideo.o ultracam.o
 obj-$(CONFIG_USB_KONICAWC)	+= konicawc.o usbvideo.o
diff --git a/drivers/usb/misc/dabfirmware.h b/drivers/usb/media/dabfirmware.h
index d14d803566a3..d14d803566a3 100644
--- a/drivers/usb/misc/dabfirmware.h
+++ b/drivers/usb/media/dabfirmware.h
diff --git a/drivers/usb/misc/dabusb.c b/drivers/usb/media/dabusb.c
index e84169eacb5f..e84169eacb5f 100644
--- a/drivers/usb/misc/dabusb.c
+++ b/drivers/usb/media/dabusb.c
diff --git a/drivers/usb/misc/dabusb.h b/drivers/usb/media/dabusb.h
index 9fc09c8a289f..9fc09c8a289f 100644
--- a/drivers/usb/misc/dabusb.h
+++ b/drivers/usb/media/dabusb.h
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 19086bb18429..1eeab1db17f9 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -6,11 +6,9 @@
 O_TARGET	:= usb-misc.o
 
 obj-$(CONFIG_USB_AUERSWALD)	+= auerswald.o
-obj-$(CONFIG_USB_DABUSB)	+= dabusb.o
 obj-$(CONFIG_USB_EMI26)		+= emi26.o
 obj-$(CONFIG_USB_RIO500)	+= rio500.o
 obj-$(CONFIG_USB_TIGL)		+= tiglusb.o
 obj-$(CONFIG_USB_USS720)	+= uss720.o
-obj-$(CONFIG_USB_WACOM)		+= wacom.o
 
 include $(TOPDIR)/Rules.make
diff --git a/drivers/usb/net/Config.in b/drivers/usb/net/Config.in
index 0d887a1295b2..eb5d55b4444b 100644
--- a/drivers/usb/net/Config.in
+++ b/drivers/usb/net/Config.in
@@ -5,10 +5,11 @@ comment 'USB Network adaptors'
 if [ "$CONFIG_NET" = "n" ]; then
    comment '  Networking support is needed for USB Networking device support'
 else
+   dep_tristate '  USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+   dep_tristate '  USB CDC Ethernet support (EXPERIMENTAL)' CONFIG_USB_CDCETHER $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
+   dep_tristate '  USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
    dep_tristate '  USB Pegasus/Pegasus-II based ethernet device support (EXPERIMENTAL)' CONFIG_USB_PEGASUS $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
    dep_tristate '  USB RTL8150 based ethernet device support (EXPERIMENTAL)' CONFIG_USB_RTL8150 $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
-   dep_tristate '  USB KLSI KL5USB101-based ethernet device support (EXPERIMENTAL)' CONFIG_USB_KAWETH $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
-   dep_tristate '  USB CATC NetMate-based Ethernet device support (EXPERIMENTAL)' CONFIG_USB_CATC $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
    dep_tristate '  USB-to-USB Networking cable device support (EXPERIMENTAL)' CONFIG_USB_USBNET $CONFIG_USB $CONFIG_NET $CONFIG_EXPERIMENTAL
 fi
 
@@ -17,7 +18,7 @@ fi
 if [ "$CONFIG_USB_PEGASUS" = "y" -o "$CONFIG_USB_RTL8150" = "y" -o "$CONFIG_USB_KAWETH" = "y" ]; then
    define_bool CONFIG_USB_NET y
 fi
-if [ "$CONFIG_USB_CATC" = "y" -o "$CONFIG_USB_USBNET" = "y" ]; then
+if [ "$CONFIG_USB_CATC" = "y" -o "$CONFIG_USB_USBNET" = "y" -o "$CONFIG_USB_CDCETHER" = "y" ]; then
    define_bool CONFIG_USB_NET y
 fi
    
diff --git a/drivers/usb/net/Makefile b/drivers/usb/net/Makefile
index 53fc4f22b251..019a31203ea7 100644
--- a/drivers/usb/net/Makefile
+++ b/drivers/usb/net/Makefile
@@ -5,6 +5,7 @@
 O_TARGET	:= usb-net.o
 
 obj-$(CONFIG_USB_CATC)		+= catc.o
+obj-$(CONFIG_USB_CDCETHER)	+= cdc-ether.o
 obj-$(CONFIG_USB_KAWETH)	+= kaweth.o
 obj-$(CONFIG_USB_PEGASUS)	+= pegasus.o
 obj-$(CONFIG_USB_RTL8150)	+= rtl8150.o
diff --git a/drivers/usb/class/cdc-ether.c b/drivers/usb/net/cdc-ether.c
index 3b41f2a445dc..3b41f2a445dc 100644
--- a/drivers/usb/class/cdc-ether.c
+++ b/drivers/usb/net/cdc-ether.c
diff --git a/drivers/usb/class/cdc-ether.h b/drivers/usb/net/cdc-ether.h
index e91c2115ac3a..e91c2115ac3a 100644
--- a/drivers/usb/class/cdc-ether.h
+++ b/drivers/usb/net/cdc-ether.h
diff --git a/drivers/usb/storage/Config.in b/drivers/usb/storage/Config.in
new file mode 100644
index 000000000000..6668bad1446d
--- /dev/null
+++ b/drivers/usb/storage/Config.in
@@ -0,0 +1,15 @@
+#
+# USB Storage driver configuration
+#
+if [ "$CONFIG_SCSI" = "n" ]; then
+   comment '  SCSI support is needed for USB Storage'
+fi
+dep_tristate '  USB Mass Storage support' CONFIG_USB_STORAGE $CONFIG_USB $CONFIG_SCSI
+   dep_mbool '    USB Mass Storage verbose debug' CONFIG_USB_STORAGE_DEBUG $CONFIG_USB_STORAGE
+   dep_mbool '    Datafab MDCFE-B Compact Flash Reader support' CONFIG_USB_STORAGE_DATAFAB $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
+   dep_mbool '    Freecom USB/ATAPI Bridge support' CONFIG_USB_STORAGE_FREECOM  $CONFIG_USB_STORAGE
+   dep_mbool '    ISD-200 USB/ATA Bridge support' CONFIG_USB_STORAGE_ISD200 $CONFIG_USB_STORAGE
+   dep_mbool '    Microtech CompactFlash/SmartMedia support' CONFIG_USB_STORAGE_DPCM $CONFIG_USB_STORAGE
+   dep_mbool '    HP CD-Writer 82xx support' CONFIG_USB_STORAGE_HP8200e $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
+   dep_mbool '    SanDisk SDDR-09 (and other SmartMedia) support' CONFIG_USB_STORAGE_SDDR09 $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
+   dep_mbool '    Lexar Jumpshot Compact Flash Reader' CONFIG_USB_STORAGE_JUMPSHOT $CONFIG_USB_STORAGE $CONFIG_EXPERIMENTAL
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
new file mode 100644
index 000000000000..18e64e83b174
--- /dev/null
+++ b/drivers/usb/storage/Makefile
@@ -0,0 +1,27 @@
+#
+# Makefile for the USB Mass Storage device drivers.
+#
+# 15 Aug 2000, Christoph Hellwig <hch@infradead.org>
+# Rewritten to use lists instead of if-statements.
+#
+
+O_TARGET	:= storage.o
+EXTRA_CFLAGS	:= -I../../scsi/
+
+obj-$(CONFIG_USB_STORAGE)	+= usb-storage.o
+
+usb-storage-obj-$(CONFIG_USB_STORAGE_DEBUG)			+= debug.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_HP8200e)			+= shuttle_usbat.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_SDDR09)			+= sddr09.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_FREECOM)			+= freecom.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_SMARTMEDIA)	+= shuttle_sm.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_SHUTTLE_COMPACTFLASH)	+= shuttle_cf.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_DPCM)			+= dpcm.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_ISD200)			+= isd200.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_DATAFAB)			+= datafab.o
+usb-storage-obj-$(CONFIG_USB_STORAGE_JUMPSHOT)			+= jumpshot.o
+
+usb-storage-objs :=	scsiglue.o protocol.o transport.o usb.o \
+			initializers.o $(usb-storage-obj-y)
+
+include $(TOPDIR)/Rules.make
diff --git a/drivers/usb/class/storage/datafab.c b/drivers/usb/storage/datafab.c
index d1aca3be8627..d1aca3be8627 100644
--- a/drivers/usb/class/storage/datafab.c
+++ b/drivers/usb/storage/datafab.c
diff --git a/drivers/usb/class/storage/datafab.h b/drivers/usb/storage/datafab.h
index 5515583ddce3..5515583ddce3 100644
--- a/drivers/usb/class/storage/datafab.h
+++ b/drivers/usb/storage/datafab.h
diff --git a/drivers/usb/class/storage/debug.c b/drivers/usb/storage/debug.c
index 3556bfd41500..3556bfd41500 100644
--- a/drivers/usb/class/storage/debug.c
+++ b/drivers/usb/storage/debug.c
diff --git a/drivers/usb/class/storage/debug.h b/drivers/usb/storage/debug.h
index c5477dcaf55d..c5477dcaf55d 100644
--- a/drivers/usb/class/storage/debug.h
+++ b/drivers/usb/storage/debug.h
diff --git a/drivers/usb/class/storage/dpcm.c b/drivers/usb/storage/dpcm.c
index 5f7e8d4673a6..5f7e8d4673a6 100644
--- a/drivers/usb/class/storage/dpcm.c
+++ b/drivers/usb/storage/dpcm.c
diff --git a/drivers/usb/class/storage/dpcm.h b/drivers/usb/storage/dpcm.h
index e6e5637d65a9..e6e5637d65a9 100644
--- a/drivers/usb/class/storage/dpcm.h
+++ b/drivers/usb/storage/dpcm.h
diff --git a/drivers/usb/class/storage/freecom.c b/drivers/usb/storage/freecom.c
index f273ea54f635..f273ea54f635 100644
--- a/drivers/usb/class/storage/freecom.c
+++ b/drivers/usb/storage/freecom.c
diff --git a/drivers/usb/class/storage/freecom.h b/drivers/usb/storage/freecom.h
index 8c0ada8bbeb6..8c0ada8bbeb6 100644
--- a/drivers/usb/class/storage/freecom.h
+++ b/drivers/usb/storage/freecom.h
diff --git a/drivers/usb/class/storage/initializers.c b/drivers/usb/storage/initializers.c
index dd03ef7ae3ce..dd03ef7ae3ce 100644
--- a/drivers/usb/class/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
diff --git a/drivers/usb/class/storage/initializers.h b/drivers/usb/storage/initializers.h
index 51bb0241e161..51bb0241e161 100644
--- a/drivers/usb/class/storage/initializers.h
+++ b/drivers/usb/storage/initializers.h
diff --git a/drivers/usb/class/storage/isd200.c b/drivers/usb/storage/isd200.c
index f43f4a5d8f24..f43f4a5d8f24 100644
--- a/drivers/usb/class/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
diff --git a/drivers/usb/class/storage/isd200.h b/drivers/usb/storage/isd200.h
index 70ebe1c39a86..70ebe1c39a86 100644
--- a/drivers/usb/class/storage/isd200.h
+++ b/drivers/usb/storage/isd200.h
diff --git a/drivers/usb/class/storage/jumpshot.c b/drivers/usb/storage/jumpshot.c
index 94b9941cff01..94b9941cff01 100644
--- a/drivers/usb/class/storage/jumpshot.c
+++ b/drivers/usb/storage/jumpshot.c
diff --git a/drivers/usb/class/storage/jumpshot.h b/drivers/usb/storage/jumpshot.h
index 8147197cd4fc..8147197cd4fc 100644
--- a/drivers/usb/class/storage/jumpshot.h
+++ b/drivers/usb/storage/jumpshot.h
diff --git a/drivers/usb/class/storage/protocol.c b/drivers/usb/storage/protocol.c
index c2bc41be7357..c2bc41be7357 100644
--- a/drivers/usb/class/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
diff --git a/drivers/usb/class/storage/protocol.h b/drivers/usb/storage/protocol.h
index 4153a6c7144b..4153a6c7144b 100644
--- a/drivers/usb/class/storage/protocol.h
+++ b/drivers/usb/storage/protocol.h
diff --git a/drivers/usb/class/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c
index 596aa799adf1..596aa799adf1 100644
--- a/drivers/usb/class/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
diff --git a/drivers/usb/class/storage/scsiglue.h b/drivers/usb/storage/scsiglue.h
index 13b9f3bec266..13b9f3bec266 100644
--- a/drivers/usb/class/storage/scsiglue.h
+++ b/drivers/usb/storage/scsiglue.h
diff --git a/drivers/usb/class/storage/sddr09.c b/drivers/usb/storage/sddr09.c
index bc14015ae97f..bc14015ae97f 100644
--- a/drivers/usb/class/storage/sddr09.c
+++ b/drivers/usb/storage/sddr09.c
diff --git a/drivers/usb/class/storage/sddr09.h b/drivers/usb/storage/sddr09.h
index ac984469f157..ac984469f157 100644
--- a/drivers/usb/class/storage/sddr09.h
+++ b/drivers/usb/storage/sddr09.h
diff --git a/drivers/usb/class/storage/shuttle_usbat.c b/drivers/usb/storage/shuttle_usbat.c
index 9770f9103210..9770f9103210 100644
--- a/drivers/usb/class/storage/shuttle_usbat.c
+++ b/drivers/usb/storage/shuttle_usbat.c
diff --git a/drivers/usb/class/storage/shuttle_usbat.h b/drivers/usb/storage/shuttle_usbat.h
index ad5078f16aa7..ad5078f16aa7 100644
--- a/drivers/usb/class/storage/shuttle_usbat.h
+++ b/drivers/usb/storage/shuttle_usbat.h
diff --git a/drivers/usb/class/storage/transport.c b/drivers/usb/storage/transport.c
index 04ba81c47102..04ba81c47102 100644
--- a/drivers/usb/class/storage/transport.c
+++ b/drivers/usb/storage/transport.c
diff --git a/drivers/usb/class/storage/transport.h b/drivers/usb/storage/transport.h
index 2dc2ac1a3e0a..2dc2ac1a3e0a 100644
--- a/drivers/usb/class/storage/transport.h
+++ b/drivers/usb/storage/transport.h
diff --git a/drivers/usb/class/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 87ba0ccb0d30..87ba0ccb0d30 100644
--- a/drivers/usb/class/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
diff --git a/drivers/usb/class/storage/usb.c b/drivers/usb/storage/usb.c
index 277a322bc869..277a322bc869 100644
--- a/drivers/usb/class/storage/usb.c
+++ b/drivers/usb/storage/usb.c
diff --git a/drivers/usb/class/storage/usb.h b/drivers/usb/storage/usb.h
index 5fd910ec70a7..5fd910ec70a7 100644
--- a/drivers/usb/class/storage/usb.h
+++ b/drivers/usb/storage/usb.h