From 7300903d7c19c4ae56311bf2f95716c6365ab6d8 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Fri, 8 Dec 2006 04:43:41 -0500 Subject: [PATCH] --- yaml --- r: 44980 b: refs/heads/master c: 25c68a33b7b74b37793b1250007e5e21d621a7fc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ibm_acpi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 19b7f4015b8f..065d32392b8e 100644 --- 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 index 92e7b6eb8f19..ab1800735346 100644 --- 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()) {