Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / arm / mach-omap2 / usb-tusb6010.c

diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 10a2013..64a0112 100644 (file)
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -17,8 +17,8 @@
 #include <linux/usb/musb.h>
 
 #include <plat/gpmc.h>
-#include <plat/mux.h>
 
+#include "mux.h"
 
 static u8              async_cs, sync_cs;
 static unsigned                refclk_psec;
@@ -325,17 +325,17 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,
        else {
                /* assume OMAP 2420 ES2.0 and later */
                if (dmachan & (1 << 0))
-                       omap_cfg_reg(AA10_242X_DMAREQ0);
+                       omap_mux_init_signal("sys_ndmareq0", 0);
                if (dmachan & (1 << 1))
-                       omap_cfg_reg(AA6_242X_DMAREQ1);
+                       omap_mux_init_signal("sys_ndmareq1", 0);
                if (dmachan & (1 << 2))
-                       omap_cfg_reg(E4_242X_DMAREQ2);
+                       omap_mux_init_signal("sys_ndmareq2", 0);
                if (dmachan & (1 << 3))
-                       omap_cfg_reg(G4_242X_DMAREQ3);
+                       omap_mux_init_signal("sys_ndmareq3", 0);
                if (dmachan & (1 << 4))
-                       omap_cfg_reg(D3_242X_DMAREQ4);
+                       omap_mux_init_signal("sys_ndmareq4", 0);
                if (dmachan & (1 << 5))
-                       omap_cfg_reg(E3_242X_DMAREQ5);
+                       omap_mux_init_signal("sys_ndmareq5", 0);
        }
 
        /* so far so good ... register the device */