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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-orion5x
/
mpp.c
diff --git
a/arch/arm/mach-orion5x/mpp.c
b/arch/arm/mach-orion5x/mpp.c
index
e23a3f9
..
bc4c3b9
100644
(file)
--- a/
arch/arm/mach-orion5x/mpp.c
+++ b/
arch/arm/mach-orion5x/mpp.c
@@
-124,6
+124,9
@@
void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL);
u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL);
+ /* Initialize gpiolib. */
+ orion_gpio_init();
+
while (mode->mpp >= 0) {
u32 *reg;
int num_type;