--- zzzz-none-000/linux-2.6.28.10/drivers/usb/musb/Makefile	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/drivers/usb/musb/Makefile	2010-03-30 18:41:51.000000000 +0000
@@ -10,6 +10,10 @@
 	musb_hdrc-objs	+= davinci.o
 endif
 
+ifeq ($(CONFIG_ARCH_PUMA5),y)
+        musb_hdrc-objs += puma5.o
+endif
+
 ifeq ($(CONFIG_USB_TUSB6010),y)
 	musb_hdrc-objs	+= tusb6010.o
 endif
@@ -30,6 +34,10 @@
 	musb_hdrc-objs		+= musb_virthub.o musb_host.o
 endif
 
+ifeq ($(CONFIG_USB_HOST_HSET_MODE),y)
+        musb_hdrc-objs          += musbhset.o
+endif
+
 # 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).
@@ -42,8 +50,11 @@
 
   else
     ifeq ($(CONFIG_USB_TI_CPPI_DMA),y)
-      musb_hdrc-objs		+= cppi_dma.o
-
+      ifeq ($(CONFIG_ARCH_PUMA5),y)
+        musb_hdrc-objs		+= cppi41_dma.o
+      else
+        musb_hdrc-objs		+= cppi_dma.o
+      endif
     else
       ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
         musb_hdrc-objs		+= tusb6010_omap.o
@@ -64,6 +75,23 @@
 
 # Debugging
 
-ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
-	EXTRA_CFLAGS += -DDEBUG
+MUSB_DEBUG:=$(CONFIG_USB_MUSB_LOGLEVEL)
+
+ifeq ("$(strip $(MUSB_DEBUG))","")
+    ifdef CONFIG_USB_DEBUG
+	MUSB_DEBUG:=1
+    else
+	MUSB_DEBUG:=0
+    endif
 endif
+
+ifneq ($(MUSB_DEBUG),0)
+    EXTRA_CFLAGS += -DDEBUG
+
+    ifeq ($(CONFIG_PROC_FS),y)
+	musb_hdrc-objs		+= musb_procfs.o
+    endif
+
+endif
+
+EXTRA_CFLAGS += -DMUSB_DEBUG=$(MUSB_DEBUG)