Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / mux2420.c

diff --git a/arch/arm/mach-omap2/mux2420.c b/arch/arm/mach-omap2/mux2420.c
index 414af5434456e84dc8c8623e2f7507827b66b926..cf6de0971c6ce8cb8744e0ea76eee6e04b6d9eb6 100644 (file)
--- a/arch/arm/mach-omap2/mux2420.c
+++ b/arch/arm/mach-omap2/mux2420.c
@@ -678,11 +678,13 @@ int __init omap2420_mux_init(struct omap_board_mux *board_subset, int flags)
        case OMAP_PACKAGE_ZAF:
                /* REVISIT: Please add data */
        default:
-               pr_warning("mux: No ball data available for omap2420 package\n");
+               pr_warning("%s: No ball data available for omap2420 package\n",
+                               __func__);
        }
 
-       return omap_mux_init(OMAP2420_CONTROL_PADCONF_MUX_PBASE,
+       return omap_mux_init("core", OMAP_MUX_REG_8BIT | OMAP_MUX_GPIO_IN_MODE3,
+                            OMAP2420_CONTROL_PADCONF_MUX_PBASE,
                             OMAP2420_CONTROL_PADCONF_MUX_SIZE,
-                               omap2420_muxmodes, NULL, board_subset,
-                               package_balls);
+                            omap2420_muxmodes, NULL, board_subset,
+                            package_balls);
 }