commit 25c68a33b7b74b37793b1250007e5e21d621a7fc
author Len Brown <len.brown@intel.com> Fri Dec 08 04:43:41 2006 -0500
committer Len Brown <len.brown@intel.com> Sat Dec 16 00:39:50 2006 -0500
tree 2335d2fb8fcc6c00062ceb45f9c3412bcb1cd780
parent 6bfe5c9d6f4dcaa998f67e691359cf7b1c4b443d

ACPI: ibm_acpi: respond to workqueue update

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/ibm_acpi.c

diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 92e7b6e..ab18007 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -1825,9 +1825,9 @@
 static int fan_control_status_known;
 static u8 fan_control_initial_status;
 
-static void fan_watchdog_fire(void *ignored);
+static void fan_watchdog_fire(struct work_struct *ignored);
 static int fan_watchdog_maxinterval;
-static DECLARE_WORK(fan_watchdog_task, fan_watchdog_fire, NULL);
+static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire);
 
 static int fan_init(void)
 {
@@ -2284,7 +2284,7 @@
 	return rc;
 }
 
-static void fan_watchdog_fire(void *ignored)
+static void fan_watchdog_fire(struct work_struct *ignored)
 {
 	printk(IBM_NOTICE "fan watchdog: enabling fan\n");
 	if (fan_set_enable()) {