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 git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
devices.c
diff --git
a/arch/arm/mach-omap2/devices.c
b/arch/arm/mach-omap2/devices.c
index
5b8ca68
..
1077ad6
100644
(file)
--- a/
arch/arm/mach-omap2/devices.c
+++ b/
arch/arm/mach-omap2/devices.c
@@
-230,7
+230,7
@@
struct omap_device_pm_latency omap_keyboard_latency[] = {
};
int __init omap4_keyboard_init(struct omap4_keypad_platform_data
};
int __init omap4_keyboard_init(struct omap4_keypad_platform_data
-
*sdp4430_keypad_
data)
+
*sdp4430_keypad_data, struct omap_board_data *b
data)
{
struct omap_device *od;
struct omap_hwmod *oh;
{
struct omap_device *od;
struct omap_hwmod *oh;
@@
-257,6
+257,7
@@
int __init omap4_keyboard_init(struct omap4_keypad_platform_data
name, oh->name);
return PTR_ERR(od);
}
name, oh->name);
return PTR_ERR(od);
}
+ oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);
return 0;
}
return 0;
}