Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / usb / musb / Makefile

diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index ce164e8998d8c6923c103126f98bcfef1f423ad0..74df5284894fe8d46ff0e67afd29e76b46e8f0c1 100644 (file)
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -8,22 +8,19 @@ obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o
 
 musb_hdrc-y := musb_core.o
 
-musb_hdrc-$(CONFIG_ARCH_DAVINCI_DMx)           += davinci.o
-musb_hdrc-$(CONFIG_ARCH_DAVINCI_DA8XX)         += da8xx.o
-musb_hdrc-$(CONFIG_USB_TUSB6010)               += tusb6010.o
-musb_hdrc-$(CONFIG_ARCH_OMAP2430)              += omap2430.o
-ifeq ($(CONFIG_USB_MUSB_AM35X),y)
-       musb_hdrc-$(CONFIG_ARCH_OMAP3430)       += am35x.o
-else
-       musb_hdrc-$(CONFIG_ARCH_OMAP3430)       += omap2430.o
-endif
-musb_hdrc-$(CONFIG_ARCH_OMAP4)                 += omap2430.o
-musb_hdrc-$(CONFIG_BF54x)                      += blackfin.o
-musb_hdrc-$(CONFIG_BF52x)                      += blackfin.o
 musb_hdrc-$(CONFIG_USB_GADGET_MUSB_HDRC)       += musb_gadget_ep0.o musb_gadget.o
 musb_hdrc-$(CONFIG_USB_MUSB_HDRC_HCD)          += musb_virthub.o musb_host.o
 musb_hdrc-$(CONFIG_DEBUG_FS)                   += musb_debugfs.o
 
+# Hardware Glue Layer
+obj-$(CONFIG_USB_MUSB_OMAP2PLUS)               += omap2430.o
+obj-$(CONFIG_USB_MUSB_AM35X)                   += am35x.o
+obj-$(CONFIG_USB_MUSB_TUSB6010)                        += tusb6010.o
+obj-$(CONFIG_USB_MUSB_DAVINCI)                 += davinci.o
+obj-$(CONFIG_USB_MUSB_DA8XX)                   += da8xx.o
+obj-$(CONFIG_USB_MUSB_BLACKFIN)                        += blackfin.o
+obj-$(CONFIG_USB_MUSB_UX500)                   += ux500.o
+
 # the kconfig must guarantee that only one of the
 # possible I/O schemes will be enabled at a time ...
 # PIO only, or DMA (several potential schemes).