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/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip32
/
ip32-reset.c
diff --git
a/arch/mips/sgi-ip32/ip32-reset.c
b/arch/mips/sgi-ip32/ip32-reset.c
index
79ddb46
..
fd0932b
100644
(file)
--- a/
arch/mips/sgi-ip32/ip32-reset.c
+++ b/
arch/mips/sgi-ip32/ip32-reset.c
@@
-120,7
+120,7
@@
static inline void ip32_power_button(void)
if (has_panicked)
return;
- if (shuting_down || kill_
proc(1,
SIGINT, 1)) {
+ if (shuting_down || kill_
cad_pid(
SIGINT, 1)) {
/* No init process or button pressed twice. */
ip32_machine_power_off();
}