aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-09-23 10:38:59 -0400
committerLen Brown <len.brown@intel.com>2007-09-23 22:38:14 -0400
commit4b2fe7e2a79727104e549a89a32b4aae26521861 (patch)
tree53cb26e7d60534183251ba1c3a853944517f8383 /drivers
parentb7e113dc9d52c4a37d2da6fafe77959f3a28eccf (diff)
ACPI: thinkpad-acpi: make room for more features in tp_features bitfield
Increase tp_features to 32 bits. It is too close to running out of room. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/thinkpad_acpi.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
index 082a1cbc16c0..fa64dedd26d9 100644
--- a/drivers/misc/thinkpad_acpi.h
+++ b/drivers/misc/thinkpad_acpi.h
@@ -233,22 +233,22 @@ struct ibm_init_struct {
233 233
234static struct { 234static struct {
235#ifdef CONFIG_THINKPAD_ACPI_BAY 235#ifdef CONFIG_THINKPAD_ACPI_BAY
236 u16 bay_status:1; 236 u32 bay_status:1;
237 u16 bay_eject:1; 237 u32 bay_eject:1;
238 u16 bay_status2:1; 238 u32 bay_status2:1;
239 u16 bay_eject2:1; 239 u32 bay_eject2:1;
240#endif 240#endif
241 u16 bluetooth:1; 241 u32 bluetooth:1;
242 u16 hotkey:1; 242 u32 hotkey:1;
243 u16 hotkey_mask:1; 243 u32 hotkey_mask:1;
244 u16 hotkey_wlsw:1; 244 u32 hotkey_wlsw:1;
245 u16 light:1; 245 u32 light:1;
246 u16 light_status:1; 246 u32 light_status:1;
247 u16 wan:1; 247 u32 wan:1;
248 u16 fan_ctrl_status_undef:1; 248 u32 fan_ctrl_status_undef:1;
249 u16 input_device_registered:1; 249 u32 input_device_registered:1;
250 u16 platform_drv_registered:1; 250 u32 platform_drv_registered:1;
251 u16 platform_drv_attrs_registered:1; 251 u32 platform_drv_attrs_registered:1;
252} tp_features; 252} tp_features;
253 253
254struct thinkpad_id_data { 254struct thinkpad_id_data {