diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-15 11:59:21 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-07-15 11:59:21 -0500 |
| commit | 8b6b009b785477103c873e882111a813649efb9b (patch) | |
| tree | 3d2983e6f86ba07d8e3cd9969ed5c79250aa9252 /arch | |
| parent | 0521c7799feeca4cdf918c63f9b582e637312bfd (diff) | |
| parent | ebddba2fce04f86d41c2bbd52753e83c96905d01 (diff) | |
Merge branch 'omap4_next' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into L24x8
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 916773dc0e6f..6ef0095f6ce1 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -258,7 +258,7 @@ static int __init sdp4430_keypad_init(void) unsigned int length = 0, id = 0; int hw_mod_name_len = 16; char oh_name[hw_mod_name_len]; - char *name = "omap4-keypad"; + char *name = "kbd"; length = snprintf(oh_name, hw_mod_name_len, "kbd"); |