Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / usb / musb / musbhsdma.c

diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 0fc6ca6bc60ac6e64b5f37ee9b3a67c8d978f609..3d1fd52a15a9958f2256fc78b71a440b06e80a81 100644 (file)
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -380,8 +380,7 @@ void dma_controller_destroy(struct dma_controller *c)
        kfree(controller);
 }
 
-struct dma_controller *__devinit
-dma_controller_create(struct musb *musb, void __iomem *base)
+struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *base)
 {
        struct musb_dma_controller *controller;
        struct device *dev = musb->controller;