aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/thinkpad_acpi.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
-rw-r--r--drivers/misc/thinkpad_acpi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index b2348d7a07c4..06d4c3839afd 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -104,7 +104,7 @@ static acpi_handle ecrd_handle, ecwr_handle; /* 570 EC access */
104static acpi_handle cmos_handle, hkey_handle; /* basic thinkpad handles */ 104static acpi_handle cmos_handle, hkey_handle; /* basic thinkpad handles */
105 105
106static void ibm_handle_init(char *name, 106static void ibm_handle_init(char *name,
107 acpi_handle * handle, acpi_handle parent, 107 acpi_handle *handle, acpi_handle parent,
108 char **paths, int num_paths, char **path); 108 char **paths, int num_paths, char **path);
109#define IBM_HANDLE_INIT(object) \ 109#define IBM_HANDLE_INIT(object) \
110 ibm_handle_init(#object, &object##_handle, *object##_parent, \ 110 ibm_handle_init(#object, &object##_handle, *object##_parent, \
@@ -242,8 +242,8 @@ static int cmos_write(char *buf);
242 * Dock subdriver 242 * Dock subdriver
243 */ 243 */
244 244
245static acpi_handle pci_handle;
246#ifdef CONFIG_THINKPAD_ACPI_DOCK 245#ifdef CONFIG_THINKPAD_ACPI_DOCK
246static acpi_handle pci_handle;
247static acpi_handle dock_handle; 247static acpi_handle dock_handle;
248 248
249static void dock_notify(struct ibm_struct *ibm, u32 event); 249static void dock_notify(struct ibm_struct *ibm, u32 event);