git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
kernel
/
power
/
poweroff.c
diff --git
a/kernel/power/poweroff.c
b/kernel/power/poweroff.c
index
7a4144b
..
678ec73
100644
(file)
--- a/
kernel/power/poweroff.c
+++ b/
kernel/power/poweroff.c
@@
-16,15
+16,14
@@
* callback we use.
*/
* callback we use.
*/
-static void do_poweroff(
void
*dummy)
+static void do_poweroff(
struct work_struct
*dummy)
{
kernel_power_off();
}
{
kernel_power_off();
}
-static DECLARE_WORK(poweroff_work, do_poweroff
, NULL
);
+static DECLARE_WORK(poweroff_work, do_poweroff);
-static void handle_poweroff(int key, struct pt_regs *pt_regs,
- struct tty_struct *tty)
+static void handle_poweroff(int key, struct tty_struct *tty)
{
schedule_work(&poweroff_work);
}
{
schedule_work(&poweroff_work);
}