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.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 7ebaaa40e183..ee1b93a2bbdd 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -163,7 +163,7 @@ static int register_ibmacpi_subdriver(struct ibm_struct *ibm);
163 * Bay subdriver 163 * Bay subdriver
164 */ 164 */
165 165
166#ifdef CONFIG_ACPI_IBM_BAY 166#ifdef CONFIG_THINKPAD_ACPI_BAY
167static int bay_status_supported, bay_eject_supported; 167static int bay_status_supported, bay_eject_supported;
168static int bay_status2_supported, bay_eject2_supported; 168static int bay_status2_supported, bay_eject2_supported;
169 169
@@ -174,7 +174,7 @@ static int bay_init(void);
174static void bay_notify(struct ibm_struct *ibm, u32 event); 174static void bay_notify(struct ibm_struct *ibm, u32 event);
175static int bay_read(char *p); 175static int bay_read(char *p);
176static int bay_write(char *buf); 176static int bay_write(char *buf);
177#endif /* CONFIG_ACPI_IBM_BAY */ 177#endif /* CONFIG_THINKPAD_ACPI_BAY */
178 178
179 179
180/* 180/*
@@ -229,13 +229,13 @@ static int cmos_write(char *buf);
229 */ 229 */
230 230
231static acpi_handle pci_handle; 231static acpi_handle pci_handle;
232#ifdef CONFIG_ACPI_IBM_DOCK 232#ifdef CONFIG_THINKPAD_ACPI_DOCK
233static acpi_handle dock_handle; 233static acpi_handle dock_handle;
234 234
235static void dock_notify(struct ibm_struct *ibm, u32 event); 235static void dock_notify(struct ibm_struct *ibm, u32 event);
236static int dock_read(char *p); 236static int dock_read(char *p);
237static int dock_write(char *buf); 237static int dock_write(char *buf);
238#endif /* CONFIG_ACPI_IBM_DOCK */ 238#endif /* CONFIG_THINKPAD_ACPI_DOCK */
239 239
240 240
241/* 241/*