Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

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

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index a50c2bc506f245d34bb0785d81cf3856151bd65e..36e476dd912388d0257ccdd82c15af888c5e8256 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_USB_MIDI)                += class/
 obj-$(CONFIG_USB_PRINTER)      += class/
 
 obj-$(CONFIG_USB_STORAGE)      += storage/
+obj-$(CONFIG_USB)              += storage/
 
 obj-$(CONFIG_USB_AIPTEK)       += input/
 obj-$(CONFIG_USB_ATI_REMOTE)   += input/
@@ -37,6 +38,7 @@ obj-$(CONFIG_USB_XPAD)                += input/
 
 obj-$(CONFIG_USB_DABUSB)       += media/
 obj-$(CONFIG_USB_DSBR)         += media/
+obj-$(CONFIG_USB_ET61X251)     += media/
 obj-$(CONFIG_USB_IBMCAM)       += media/
 obj-$(CONFIG_USB_KONICAWC)     += media/
 obj-$(CONFIG_USB_OV511)                += media/