projects
/
cascardo
/
linux.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/davem/sparc-2.6
[cascardo/linux.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-platform.c
diff --git
a/arch/mips/sgi-ip22/ip22-platform.c
b/arch/mips/sgi-ip22/ip22-platform.c
index
fc6df96
..
6014123
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-platform.c
+++ b/
arch/mips/sgi-ip22/ip22-platform.c
@@
-188,8
+188,7
@@
static int __init sgi_button_devinit(void)
if (ip22_is_fullhouse())
return 0; /* full house has no volume buttons */
if (ip22_is_fullhouse())
return 0; /* full house has no volume buttons */
- return IS_ERR(platform_device_register_simple("sgiindybtns",
- -1, NULL, 0));
+ return IS_ERR(platform_device_register_simple("sgibtns", -1, NULL, 0));
}
device_initcall(sgi_button_devinit);
}
device_initcall(sgi_button_devinit);