From 842d0d394147485695e70d5eb6a2843ea5c0804b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 2 Oct 2011 16:45:47 +0200
Subject: [PATCH] --- yaml --- r: 280847 b: refs/heads/master c:
 9a35f8767a568bdbb21ba7c3276fdc5321e3960d h: refs/heads/master i:   280845:
 4de4ee020e9261666b2a4cd8d0e0e468d8b3dc7b   280843:
 99329e5dced8a75fdd6369a974f16702e95d9bb2   280839:
 c6fe7f6810dc3fc8d37ca5e872b92ffd296d2772   280831:
 0c975dc2eadccd8e3096bbdbc14bc3ea958c382b v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-omap2/board-n8x0.c | 2 +-
 trunk/drivers/usb/musb/musb_core.c     | 3 ++-
 trunk/drivers/usb/musb/musb_io.h       | 2 +-
 trunk/drivers/usb/musb/tusb6010.c      | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2680f16509b..b531a7607302 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e7fc3ba68e28acbcc9f4ee753be12be84533ba2
+refs/heads/master: 9a35f8767a568bdbb21ba7c3276fdc5321e3960d
diff --git a/trunk/arch/arm/mach-omap2/board-n8x0.c b/trunk/arch/arm/mach-omap2/board-n8x0.c
index e9d5f4a3d064..29136929ddbb 100644
--- a/trunk/arch/arm/mach-omap2/board-n8x0.c
+++ b/trunk/arch/arm/mach-omap2/board-n8x0.c
@@ -46,7 +46,7 @@ static struct device *mmc_device;
 #define TUSB6010_GPIO_ENABLE	0
 #define TUSB6010_DMACHAN	0x3f
 
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined(CONFIG_USB_MUSB_TUSB6010_MODULE)
 /*
  * Enable or disable power to TUSB6010. When enabling, turn on 3.3 V and
  * 1.5 V voltage regulators of PM companion chip. Companion chip will then
diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c
index 2141976d423c..90b9da1428b4 100644
--- a/trunk/drivers/usb/musb/musb_core.c
+++ b/trunk/drivers/usb/musb/musb_core.c
@@ -1432,7 +1432,7 @@ static int __init musb_core_init(u16 musb_type, struct musb *musb)
 		struct musb_hw_ep	*hw_ep = musb->endpoints + i;
 
 		hw_ep->fifo = MUSB_FIFO_OFFSET(i) + mbase;
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
 		hw_ep->fifo_async = musb->async + 0x400 + MUSB_FIFO_OFFSET(i);
 		hw_ep->fifo_sync = musb->sync + 0x400 + MUSB_FIFO_OFFSET(i);
 		hw_ep->fifo_sync_va =
@@ -1631,6 +1631,7 @@ void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit)
 		}
 	}
 }
+EXPORT_SYMBOL_GPL(musb_dma_completion);
 
 #else
 #define use_dma			0
diff --git a/trunk/drivers/usb/musb/musb_io.h b/trunk/drivers/usb/musb/musb_io.h
index 03c6ccdbb3be..e61aa95f2d2a 100644
--- a/trunk/drivers/usb/musb/musb_io.h
+++ b/trunk/drivers/usb/musb/musb_io.h
@@ -74,7 +74,7 @@ static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
 	{ __raw_writel(data, addr + offset); }
 
 
-#ifdef CONFIG_USB_MUSB_TUSB6010
+#if defined(CONFIG_USB_MUSB_TUSB6010) || defined (CONFIG_USB_MUSB_TUSB6010_MODULE)
 
 /*
  * TUSB6010 doesn't allow 8-bit access; 16-bit access is the minimum.
diff --git a/trunk/drivers/usb/musb/tusb6010.c b/trunk/drivers/usb/musb/tusb6010.c
index ec1480191f78..1f405616e6cd 100644
--- a/trunk/drivers/usb/musb/tusb6010.c
+++ b/trunk/drivers/usb/musb/tusb6010.c
@@ -56,6 +56,7 @@ u8 tusb_get_revision(struct musb *musb)
 
 	return rev;
 }
+EXPORT_SYMBOL_GPL(tusb_get_revision);
 
 static int tusb_print_revision(struct musb *musb)
 {