git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
mux34xx.c
diff --git
a/arch/arm/mach-omap2/mux34xx.c
b/arch/arm/mach-omap2/mux34xx.c
index
574e54e
..
440c98e
100644
(file)
--- a/
arch/arm/mach-omap2/mux34xx.c
+++ b/
arch/arm/mach-omap2/mux34xx.c
@@
-2049,12
+2049,13
@@
int __init omap3_mux_init(struct omap_board_mux *board_subset, int flags)
package_balls = omap36xx_cbp_ball;
break;
default:
package_balls = omap36xx_cbp_ball;
break;
default:
- pr
intk(KERN_ERR "mux: Unknown omap package, mux disabled\n"
);
+ pr
_err("%s Unknown omap package, mux disabled\n", __func__
);
return -EINVAL;
}
return -EINVAL;
}
- return omap_mux_init(OMAP3_CONTROL_PADCONF_MUX_PBASE,
+ return omap_mux_init("core", 0,
+ OMAP3_CONTROL_PADCONF_MUX_PBASE,
OMAP3_CONTROL_PADCONF_MUX_SIZE,
OMAP3_CONTROL_PADCONF_MUX_SIZE,
-
omap3_muxmodes, package_subset, board_subset,
-
package_balls);
+ omap3_muxmodes, package_subset, board_subset,
+ package_balls);
}
}