diff options
| -rw-r--r-- | drivers/acpi/ibm_acpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 92e7b6eb8f19..ab1800735346 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/drivers/acpi/ibm_acpi.c | |||
| @@ -1825,9 +1825,9 @@ static enum fan_control_commands fan_control_commands; | |||
| 1825 | static int fan_control_status_known; | 1825 | static int fan_control_status_known; |
| 1826 | static u8 fan_control_initial_status; | 1826 | static u8 fan_control_initial_status; |
| 1827 | 1827 | ||
| 1828 | static void fan_watchdog_fire(void *ignored); | 1828 | static void fan_watchdog_fire(struct work_struct *ignored); |
| 1829 | static int fan_watchdog_maxinterval; | 1829 | static int fan_watchdog_maxinterval; |
| 1830 | static DECLARE_WORK(fan_watchdog_task, fan_watchdog_fire, NULL); | 1830 | static DECLARE_DELAYED_WORK(fan_watchdog_task, fan_watchdog_fire); |
| 1831 | 1831 | ||
| 1832 | static int fan_init(void) | 1832 | static int fan_init(void) |
| 1833 | { | 1833 | { |
| @@ -2284,7 +2284,7 @@ static int fan_write(char *buf) | |||
| 2284 | return rc; | 2284 | return rc; |
| 2285 | } | 2285 | } |
| 2286 | 2286 | ||
| 2287 | static void fan_watchdog_fire(void *ignored) | 2287 | static void fan_watchdog_fire(struct work_struct *ignored) |
| 2288 | { | 2288 | { |
| 2289 | printk(IBM_NOTICE "fan watchdog: enabling fan\n"); | 2289 | printk(IBM_NOTICE "fan watchdog: enabling fan\n"); |
| 2290 | if (fan_set_enable()) { | 2290 | if (fan_set_enable()) { |
