Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / usb / Makefile

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 8b7ff467d26242a2b08a55a4055e25d26bf17d49..f5de58a63f2bfdac82319fad26e6d616a77c441a 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -15,7 +15,6 @@ 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_ACM)          += class/
@@ -27,10 +26,7 @@ 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/