---

yaml --- r: 44980 b: refs/heads/master c: 25c68a3 h: refs/heads/master v: v3
git-mirror · Dec 16, 2006 · 7300903 · 7300903
1 parent 4795ed2
commit 7300903
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bfe5c9d6f4dcaa998f67e691359cf7b1c4b443d
+refs/heads/master: 25c68a33b7b74b37793b1250007e5e21d621a7fc
diff --git a/trunk/drivers/acpi/ibm_acpi.c b/trunk/drivers/acpi/ibm_acpi.c
@@ -1825,9 +1825,9 @@ static enum fan_control_commands fan_control_commands;
 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 @@ static int fan_write(char *buf)
 	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()) {