Merge branch 'for-2.6.36' into for-2.6.37

[karo-tx-linux.git] / drivers / usb / Makefile

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index be3c9b80bc9fb1bfda456f77fc9e83b681ca4dec..239f050efa35ccff2eb8e44191a27898c9e743cc 100644 (file)
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_USB_U132_HCD)    += host/
 obj-$(CONFIG_USB_R8A66597_HCD) += host/
 obj-$(CONFIG_USB_HWA_HCD)      += host/
 obj-$(CONFIG_USB_ISP1760_HCD)  += host/
+obj-$(CONFIG_USB_IMX21_HCD)    += host/
 
 obj-$(CONFIG_USB_C67X00_HCD)   += c67x00/
 
@@ -40,7 +41,7 @@ obj-$(CONFIG_USB_MICROTEK)    += image/
 obj-$(CONFIG_USB_SERIAL)       += serial/
 
 obj-$(CONFIG_USB)              += misc/
-obj-y                          += early/
+obj-$(CONFIG_EARLY_PRINTK_DBGP)        += early/
 
 obj-$(CONFIG_USB_ATM)          += atm/
 obj-$(CONFIG_USB_SPEEDTOUCH)   += atm/