Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[linux-2.6-omap-h63xx.git] / drivers / usb / Makefile

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index ac49b15fa76840ba74c986ee9d44c8ed7b17bf43..8b7c419b876e228439a597fccfc8a2233eafdc03 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -16,6 +16,11 @@ obj-$(CONFIG_USB_UHCI_HCD)   += host/
 obj-$(CONFIG_USB_SL811_HCD)    += host/
 obj-$(CONFIG_USB_U132_HCD)     += host/
 obj-$(CONFIG_USB_R8A66597_HCD) += host/
+obj-$(CONFIG_USB_HWA_HCD)      += host/
+
+obj-$(CONFIG_USB_C67X00_HCD)   += c67x00/
+
+obj-$(CONFIG_USB_WUSB)         += wusbcore/
 
 obj-$(CONFIG_USB_ACM)          += class/
 obj-$(CONFIG_USB_PRINTER)      += class/
@@ -28,27 +33,7 @@ obj-$(CONFIG_USB_MICROTEK)   += image/
 
 obj-$(CONFIG_USB_SERIAL)       += serial/
 
-obj-$(CONFIG_USB_ADUTUX)       += misc/
-obj-$(CONFIG_USB_APPLEDISPLAY) += misc/
-obj-$(CONFIG_USB_AUERSWALD)    += misc/
-obj-$(CONFIG_USB_BERRY_CHARGE) += misc/
-obj-$(CONFIG_USB_CYPRESS_CY7C63)+= misc/
-obj-$(CONFIG_USB_CYTHERM)      += misc/
-obj-$(CONFIG_USB_EMI26)                += misc/
-obj-$(CONFIG_USB_EMI62)                += misc/
-obj-$(CONFIG_USB_FTDI_ELAN)    += misc/
-obj-$(CONFIG_USB_IDMOUSE)      += misc/
-obj-$(CONFIG_USB_LCD)          += misc/
-obj-$(CONFIG_USB_LD)           += misc/
-obj-$(CONFIG_USB_LED)          += misc/
-obj-$(CONFIG_USB_LEGOTOWER)    += misc/
-obj-$(CONFIG_USB_PHIDGETSERVO) += misc/
-obj-$(CONFIG_USB_RIO500)       += misc/
-obj-$(CONFIG_USB_SISUSBVGA)    += misc/
-obj-$(CONFIG_USB_TEST)         += misc/
-obj-$(CONFIG_USB_TRANCEVIBRATOR)+= misc/
-obj-$(CONFIG_USB_USS720)       += misc/
-obj-$(CONFIG_USB_IOWARRIOR)    += misc/
+obj-$(CONFIG_USB)              += misc/
 
 obj-$(CONFIG_USB_ATM)          += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)   += atm/