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.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index fee04214a10b..09b2282fed0b 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -175,9 +175,7 @@ static void tpacpi_remove_driver_attributes(struct device_driver *drv);
175static int experimental; 175static int experimental;
176static u32 dbg_level; 176static u32 dbg_level;
177static int force_load; 177static int force_load;
178static char *ibm_thinkpad_ec_found;
179 178
180static char* check_dmi_for_ec(void);
181static int thinkpad_acpi_module_init(void); 179static int thinkpad_acpi_module_init(void);
182static void thinkpad_acpi_module_exit(void); 180static void thinkpad_acpi_module_exit(void);
183 181
@@ -244,6 +242,21 @@ static struct {
244 u16 input_device_registered:1; 242 u16 input_device_registered:1;
245} tp_features; 243} tp_features;
246 244
245struct thinkpad_id_data {
246 unsigned int vendor; /* ThinkPad vendor:
247 * PCI_VENDOR_ID_IBM/PCI_VENDOR_ID_LENOVO */
248
249 char *bios_version_str; /* Something like 1ZET51WW (1.03z) */
250 char *ec_version_str; /* Something like 1ZHT51WW-1.04a */
251
252 u16 bios_model; /* Big Endian, TP-1Y = 0x5931, 0 = unknown */
253 u16 ec_model;
254
255 char *model_str;
256};
257
258static struct thinkpad_id_data thinkpad_id;
259
247static struct list_head tpacpi_all_drivers; 260static struct list_head tpacpi_all_drivers;
248 261
249static struct ibm_init_struct ibms_init[]; 262static struct ibm_init_struct ibms_init[];