Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/mux2420.c b/arch/arm/mach-omap2/mux2420.c
index fdb04a7eb8aa..cf6de0971c6c 100644
--- a/arch/arm/mach-omap2/mux2420.c
+++ b/arch/arm/mach-omap2/mux2420.c
@@ -507,7 +507,7 @@ static struct omap_mux __initdata omap2420_muxmodes[] = {
  * Balls for 447-pin POP package
  */
 #ifdef CONFIG_DEBUG_FS
-struct omap_ball __initdata omap2420_pop_ball[] = {
+static struct omap_ball __initdata omap2420_pop_ball[] = {
         _OMAP2420_BALLENTRY(CAM_D0, "y4", NULL),
         _OMAP2420_BALLENTRY(CAM_D1, "y3", NULL),
         _OMAP2420_BALLENTRY(CAM_D2, "u7", NULL),
@@ -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);
 }