Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 825bf884537a2204ecdd6019093be9f52bfe4e96..ac49b15fa76840ba74c986ee9d44c8ed7b17bf43 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -15,8 +15,7 @@ obj-$(CONFIG_USB_OHCI_HCD)    += host/
 obj-$(CONFIG_USB_UHCI_HCD)     += host/
 obj-$(CONFIG_USB_SL811_HCD)    += host/
 obj-$(CONFIG_USB_U132_HCD)     += host/
-obj-$(CONFIG_ETRAX_USB_HOST)   += host/
-obj-$(CONFIG_USB_OHCI_AT91)    += host/
+obj-$(CONFIG_USB_R8A66597_HCD) += host/
 
 obj-$(CONFIG_USB_ACM)          += class/
 obj-$(CONFIG_USB_PRINTER)      += class/
@@ -24,25 +23,6 @@ obj-$(CONFIG_USB_PRINTER)    += class/
 obj-$(CONFIG_USB_STORAGE)      += storage/
 obj-$(CONFIG_USB)              += storage/
 
-obj-$(CONFIG_USB_ACECAD)       += input/
-obj-$(CONFIG_USB_AIPTEK)       += input/
-obj-$(CONFIG_USB_ATI_REMOTE)   += input/
-obj-$(CONFIG_USB_HID)          += input/
-obj-$(CONFIG_USB_KBD)          += input/
-obj-$(CONFIG_USB_KBTAB)                += input/
-obj-$(CONFIG_USB_MOUSE)                += input/
-obj-$(CONFIG_USB_MTOUCH)       += input/
-obj-$(CONFIG_USB_POWERMATE)    += input/
-obj-$(CONFIG_USB_WACOM)                += input/
-obj-$(CONFIG_USB_XPAD)         += input/
-
-obj-$(CONFIG_USB_CATC)         += net/
-obj-$(CONFIG_USB_KAWETH)       += net/
-obj-$(CONFIG_USB_PEGASUS)      += net/
-obj-$(CONFIG_USB_RTL8150)      += net/
-obj-$(CONFIG_USB_USBNET)       += net/
-obj-$(CONFIG_USB_ZD1201)       += net/
-
 obj-$(CONFIG_USB_MDC800)       += image/
 obj-$(CONFIG_USB_MICROTEK)     += image/
 
@@ -51,6 +31,7 @@ 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/
@@ -67,6 +48,7 @@ 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_ATM)          += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)   += atm/