Add a patch accepted in 2.6.24-rc1 that was forgotten
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / releases / upstream / 2.6.24-rc1 / 0005-ACPI-thinkpad-acpi-make-room-for-more-features-in.patch
blobd33e19020409d4233ccb953cc0870b9b84e5c9bb
1 From 4b2fe7e2a79727104e549a89a32b4aae26521861 Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Sun, 23 Sep 2007 11:38:59 -0300
4 Subject: [PATCH 04/23] ACPI: thinkpad-acpi: make room for more features in tp_features bitfield
6 Increase tp_features to 32 bits. It is too close to running out of room.
8 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
9 Signed-off-by: Len Brown <len.brown@intel.com>
10 ---
11 drivers/misc/thinkpad_acpi.h | 30 +++++++++++++++---------------
12 1 files changed, 15 insertions(+), 15 deletions(-)
14 diff --git a/drivers/misc/thinkpad_acpi.h b/drivers/misc/thinkpad_acpi.h
15 index 082a1cb..fa64ded 100644
16 --- a/drivers/misc/thinkpad_acpi.h
17 +++ b/drivers/misc/thinkpad_acpi.h
18 @@ -233,22 +233,22 @@ struct ibm_init_struct {
20 static struct {
21 #ifdef CONFIG_THINKPAD_ACPI_BAY
22 - u16 bay_status:1;
23 - u16 bay_eject:1;
24 - u16 bay_status2:1;
25 - u16 bay_eject2:1;
26 + u32 bay_status:1;
27 + u32 bay_eject:1;
28 + u32 bay_status2:1;
29 + u32 bay_eject2:1;
30 #endif
31 - u16 bluetooth:1;
32 - u16 hotkey:1;
33 - u16 hotkey_mask:1;
34 - u16 hotkey_wlsw:1;
35 - u16 light:1;
36 - u16 light_status:1;
37 - u16 wan:1;
38 - u16 fan_ctrl_status_undef:1;
39 - u16 input_device_registered:1;
40 - u16 platform_drv_registered:1;
41 - u16 platform_drv_attrs_registered:1;
42 + u32 bluetooth:1;
43 + u32 hotkey:1;
44 + u32 hotkey_mask:1;
45 + u32 hotkey_wlsw:1;
46 + u32 light:1;
47 + u32 light_status:1;
48 + u32 wan:1;
49 + u32 fan_ctrl_status_undef:1;
50 + u32 input_device_registered:1;
51 + u32 platform_drv_registered:1;
52 + u32 platform_drv_attrs_registered:1;
53 } tp_features;
55 struct thinkpad_id_data {
56 --
57 1.5.3.4