Merge tag 'v2.6.37' 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 9705f716386e08e3247db7ff47213c8735a8d423..ce164e8998d8c6923c103126f98bcfef1f423ad0 100644 (file)
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -2,49 +2,27 @@
 # for USB OTG silicon based on Mentor Graphics INVENTRA designs
 #
 
-musb_hdrc-objs := musb_core.o
+ccflags-$(CONFIG_USB_MUSB_DEBUG) := -DDEBUG
 
-obj-$(CONFIG_USB_MUSB_HDRC)    += musb_hdrc.o
+obj-$(CONFIG_USB_MUSB_HDRC) += musb_hdrc.o
 
-ifeq ($(CONFIG_ARCH_DAVINCI_DMx),y)
-       musb_hdrc-objs  += davinci.o
-endif
-
-ifeq ($(CONFIG_USB_TUSB6010),y)
-       musb_hdrc-objs  += tusb6010.o
-endif
-
-ifeq ($(CONFIG_ARCH_OMAP2430),y)
-       musb_hdrc-objs  += omap2430.o
-endif
-
-ifeq ($(CONFIG_ARCH_OMAP3430),y)
-       musb_hdrc-objs  += omap2430.o
-endif
-
-ifeq ($(CONFIG_ARCH_OMAP4),y)
-       musb_hdrc-objs  += omap2430.o
-endif
-
-ifeq ($(CONFIG_BF54x),y)
-       musb_hdrc-objs  += blackfin.o
-endif
+musb_hdrc-y := musb_core.o
 
-ifeq ($(CONFIG_BF52x),y)
-       musb_hdrc-objs  += blackfin.o
-endif
-
-ifeq ($(CONFIG_USB_GADGET_MUSB_HDRC),y)
-       musb_hdrc-objs          += musb_gadget_ep0.o musb_gadget.o
-endif
-
-ifeq ($(CONFIG_USB_MUSB_HDRC_HCD),y)
-       musb_hdrc-objs          += musb_virthub.o musb_host.o
-endif
-
-ifeq ($(CONFIG_DEBUG_FS),y)
-       musb_hdrc-objs          += musb_debugfs.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
 
 # the kconfig must guarantee that only one of the
 # possible I/O schemes will be enabled at a time ...
@@ -54,26 +32,17 @@ endif
 ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
 
   ifeq ($(CONFIG_USB_INVENTRA_DMA),y)
-    musb_hdrc-objs             += musbhsdma.o
+    musb_hdrc-y                        += musbhsdma.o
 
   else
     ifeq ($(CONFIG_USB_TI_CPPI_DMA),y)
-      musb_hdrc-objs           += cppi_dma.o
+      musb_hdrc-y              += cppi_dma.o
 
     else
       ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
-        musb_hdrc-objs         += tusb6010_omap.o
+       musb_hdrc-y             += tusb6010_omap.o
 
       endif
     endif
   endif
 endif
-
-
-################################################################################
-
-# Debugging
-
-ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
-       EXTRA_CFLAGS += -DDEBUG
-endif