From 8bc6bb1d7abd19179a734804b84c073a48ad5166 Mon Sep 17 00:00:00 2001
From: Shubhrajyoti D <shubhrajyoti@ti.com>
Date: Thu, 9 Aug 2012 20:08:32 +0530
Subject: [PATCH] --- yaml --- r: 325985 b: refs/heads/master c:
 07a67bbb95ea7977846bd851dab5f4f2be8e488c h: refs/heads/master i:   325983:
 fa10887d376f097b87f1ee361701c84b27c709aa v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/usb/musb/cppi_dma.c      | 2 +-
 trunk/drivers/usb/musb/musb_dma.h      | 2 +-
 trunk/drivers/usb/musb/musbhsdma.c     | 2 +-
 trunk/drivers/usb/musb/tusb6010_omap.c | 2 +-
 trunk/drivers/usb/musb/ux500_dma.c     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 43cddc59de1f..f488f78e3457 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f69dfa1f01e20387ada601f2bf772061d79e6a8f
+refs/heads/master: 07a67bbb95ea7977846bd851dab5f4f2be8e488c
diff --git a/trunk/drivers/usb/musb/cppi_dma.c b/trunk/drivers/usb/musb/cppi_dma.c
index 8637c1f69fc3..e19da82b4782 100644
--- a/trunk/drivers/usb/musb/cppi_dma.c
+++ b/trunk/drivers/usb/musb/cppi_dma.c
@@ -1316,7 +1316,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
 }
 
 /* Instantiate a software object representing a DMA controller. */
-struct dma_controller *__init
+struct dma_controller *__devinit
 dma_controller_create(struct musb *musb, void __iomem *mregs)
 {
 	struct cppi		*controller;
diff --git a/trunk/drivers/usb/musb/musb_dma.h b/trunk/drivers/usb/musb/musb_dma.h
index 3a97c4e2d4f5..24d39210d4ab 100644
--- a/trunk/drivers/usb/musb/musb_dma.h
+++ b/trunk/drivers/usb/musb/musb_dma.h
@@ -178,7 +178,7 @@ struct dma_controller {
 extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit);
 
 
-extern struct dma_controller *__init
+extern struct dma_controller *__devinit
 dma_controller_create(struct musb *, void __iomem *);
 
 extern void dma_controller_destroy(struct dma_controller *);
diff --git a/trunk/drivers/usb/musb/musbhsdma.c b/trunk/drivers/usb/musb/musbhsdma.c
index 57a608584e16..444b9ee06490 100644
--- a/trunk/drivers/usb/musb/musbhsdma.c
+++ b/trunk/drivers/usb/musb/musbhsdma.c
@@ -380,7 +380,7 @@ void dma_controller_destroy(struct dma_controller *c)
 	kfree(controller);
 }
 
-struct dma_controller *__init
+struct dma_controller *__devinit
 dma_controller_create(struct musb *musb, void __iomem *base)
 {
 	struct musb_dma_controller *controller;
diff --git a/trunk/drivers/usb/musb/tusb6010_omap.c b/trunk/drivers/usb/musb/tusb6010_omap.c
index b67b4bc596c1..53e25968ed0c 100644
--- a/trunk/drivers/usb/musb/tusb6010_omap.c
+++ b/trunk/drivers/usb/musb/tusb6010_omap.c
@@ -662,7 +662,7 @@ void dma_controller_destroy(struct dma_controller *c)
 	kfree(tusb_dma);
 }
 
-struct dma_controller *__init
+struct dma_controller *__devinit
 dma_controller_create(struct musb *musb, void __iomem *base)
 {
 	void __iomem		*tbase = musb->ctrl_base;
diff --git a/trunk/drivers/usb/musb/ux500_dma.c b/trunk/drivers/usb/musb/ux500_dma.c
index d05c7fbbb703..639d58ee24f9 100644
--- a/trunk/drivers/usb/musb/ux500_dma.c
+++ b/trunk/drivers/usb/musb/ux500_dma.c
@@ -364,7 +364,7 @@ void dma_controller_destroy(struct dma_controller *c)
 	kfree(controller);
 }
 
-struct dma_controller *__init
+struct dma_controller *__devinit
 dma_controller_create(struct musb *musb, void __iomem *base)
 {
 	struct ux500_dma_controller *controller;