diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /drivers/parisc/power.c | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | cb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a (diff) | |
| download | op-kernel-dev-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip op-kernel-dev-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.gz | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'drivers/parisc/power.c')
| -rw-r--r-- | drivers/parisc/power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c index 97e9dc0..9228e21 100644 --- a/drivers/parisc/power.c +++ b/drivers/parisc/power.c @@ -82,7 +82,7 @@ } ) -static void deferred_poweroff(void *dummy) +static void deferred_poweroff(struct work_struct *unused) { if (kill_cad_pid(SIGINT, 1)) { /* just in case killing init process failed */ @@ -96,7 +96,7 @@ static void deferred_poweroff(void *dummy) * use schedule_work(). */ -static DECLARE_WORK(poweroff_work, deferred_poweroff, NULL); +static DECLARE_WORK(poweroff_work, deferred_poweroff); static void poweroff(void) { |
