diff options
Diffstat (limited to 'drivers/misc/thinkpad_acpi.h')
-rw-r--r-- | drivers/misc/thinkpad_acpi.h | 17 |
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); | |||
175 | static int experimental; | 175 | static int experimental; |
176 | static u32 dbg_level; | 176 | static u32 dbg_level; |
177 | static int force_load; | 177 | static int force_load; |
178 | static char *ibm_thinkpad_ec_found; | ||
179 | 178 | ||
180 | static char* check_dmi_for_ec(void); | ||
181 | static int thinkpad_acpi_module_init(void); | 179 | static int thinkpad_acpi_module_init(void); |
182 | static void thinkpad_acpi_module_exit(void); | 180 | static 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 | ||
245 | struct 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 | |||
258 | static struct thinkpad_id_data thinkpad_id; | ||
259 | |||
247 | static struct list_head tpacpi_all_drivers; | 260 | static struct list_head tpacpi_all_drivers; |
248 | 261 | ||
249 | static struct ibm_init_struct ibms_init[]; | 262 | static struct ibm_init_struct ibms_init[]; |