diff options
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h index 72d62f2dabb9..e1a64f0aada9 100644 --- a/drivers/misc/thinkpad_acpi.h +++ b/drivers/misc/thinkpad_acpi.h | |||
| @@ -415,14 +415,14 @@ static int fan_write_cmd_watchdog(const char *cmd, int *rc); | |||
| 415 | */ | 415 | */ |
| 416 | 416 | ||
| 417 | static int hotkey_orig_status; | 417 | static int hotkey_orig_status; |
| 418 | static int hotkey_orig_mask; | 418 | static u32 hotkey_orig_mask; |
| 419 | 419 | ||
| 420 | static struct mutex hotkey_mutex; | 420 | static struct mutex hotkey_mutex; |
| 421 | 421 | ||
| 422 | static int hotkey_init(struct ibm_init_struct *iibm); | 422 | static int hotkey_init(struct ibm_init_struct *iibm); |
| 423 | static void hotkey_exit(void); | 423 | static void hotkey_exit(void); |
| 424 | static int hotkey_get(int *status, int *mask); | 424 | static int hotkey_get(int *status, u32 *mask); |
| 425 | static int hotkey_set(int status, int mask); | 425 | static int hotkey_set(int status, u32 mask); |
| 426 | static void hotkey_notify(struct ibm_struct *ibm, u32 event); | 426 | static void hotkey_notify(struct ibm_struct *ibm, u32 event); |
| 427 | static int hotkey_read(char *p); | 427 | static int hotkey_read(char *p); |
| 428 | static int hotkey_write(char *buf); | 428 | static int hotkey_write(char *buf); |