Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / parisc / power.c

diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 97e9dc066f95fc278cbc34bc1e49753bbf2f431d..9228e210c3bbf3c5765ef15791cd4ed35172aa5a 100644 (file)
--- 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)
 {