Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / musb / omap2430.c

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 472c30403c8f5e44b88ce3c5265255ff2d14811b..be4e77923c26e8fe2f2967e037d2ad09652f36e0 100644 (file)
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -35,8 +35,8 @@
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/mux.h>
+#include <mach/hardware.h>
+#include <mach/mux.h>
 
 #include "musb_core.h"
 #include "omap2430.h"
@@ -192,7 +192,7 @@ static int omap_set_power(struct otg_transceiver *x, unsigned mA)
        return 0;
 }
 
-int musb_platform_resume(struct musb *musb);
+static int musb_platform_resume(struct musb *musb);
 
 void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
 {
@@ -215,14 +215,14 @@ void musb_platform_set_mode(struct musb *musb, u8 musb_mode)
 
 int __init musb_platform_init(struct musb *musb)
 {
-       struct otg_transceiver *xceiv = otg_get_transceiver();
+       struct otg_transceiver *x = otg_get_transceiver();
        u32 l;
 
 #if defined(CONFIG_ARCH_OMAP2430)
        omap_cfg_reg(AE5_2430_USB0HS_STP);
 #endif
 
-       musb->xceiv = *xceiv;
+       musb->xceiv = *x;
        musb_platform_resume(musb);
 
        l = omap_readl(OTG_SYSCONFIG);
@@ -285,7 +285,7 @@ int musb_platform_suspend(struct musb *musb)
        return 0;
 }
 
-int musb_platform_resume(struct musb *musb)
+static int musb_platform_resume(struct musb *musb)
 {
        u32 l;