1 From d2fadbbbf0e42b842731da71864f222e7f119461 Mon Sep 17 00:00:00 2001
2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
3 Date: Thu, 11 Jan 2007 02:58:15 -0500
4 Subject: [PATCH] Revert "ACPI: ibm-acpi: make non-generic bay support optional"
6 This reverts commit 2df910b4c3edcce9a0c12394db6f5f4a6e69c712.
8 ACPI_BAY has not been merged into mainline yet, so the changes to ibm-acpi
9 related Kconfig entries that depend on ACPI_BAY were permanently disabling
10 ibm-acpi bay support. This is a serious regression for ThinkPad users.
12 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
13 Signed-off-by: Len Brown <len.brown@intel.com>
15 drivers/acpi/Kconfig | 11 -----------
16 drivers/acpi/ibm_acpi.c | 13 +------------
17 2 files changed, 1 insertions(+), 23 deletions(-)
19 diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
20 index 1639998..f4f000a 100644
21 --- a/drivers/acpi/Kconfig
22 +++ b/drivers/acpi/Kconfig
23 @@ -225,17 +225,6 @@ config ACPI_IBM_DOCK
25 If you are not sure, say N here.
28 - bool "Legacy Removable Bay Support"
30 - depends on ACPI_BAY=n
33 - Allows the ibm_acpi driver to handle removable bays.
34 - This support is obsoleted by CONFIG_ACPI_BAY.
36 - If you are not sure, say N here.
39 tristate "Toshiba Laptop Extras"
41 diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
42 index b72d13d..c6144ca 100644
43 --- a/drivers/acpi/ibm_acpi.c
44 +++ b/drivers/acpi/ibm_acpi.c
45 @@ -157,7 +157,6 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK", /* X30, X31, X40 */
46 "\\_SB.PCI.ISA.SLCE", /* 570 */
47 ); /* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
49 -#ifdef CONFIG_ACPI_IBM_BAY
50 IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST", /* 570 */
51 "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */
52 "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */
53 @@ -175,7 +174,6 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV", /* A3x, R32 */
54 IBM_HANDLE(bay2_ej, bay2, "_EJ3", /* 600e/x, 770e, A3x */
59 /* don't list other alternatives as we install a notify handler on the 570 */
60 IBM_HANDLE(pci, root, "\\_SB.PCI"); /* 570 */
61 @@ -1042,7 +1040,6 @@ static int light_write(char *buf)
65 -#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)
66 static int _sta(acpi_handle handle)
69 @@ -1052,7 +1049,7 @@ static int _sta(acpi_handle handle)
75 #ifdef CONFIG_ACPI_IBM_DOCK
76 #define dock_docked() (_sta(dock_handle) & 1)
78 @@ -1118,7 +1115,6 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
82 -#ifdef CONFIG_ACPI_IBM_BAY
83 static int bay_status_supported;
84 static int bay_status2_supported;
85 static int bay_eject_supported;
86 @@ -1194,7 +1190,6 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
88 acpi_bus_generate_event(ibm->device, event, 0);
92 static int cmos_read(char *p)
94 @@ -2354,7 +2349,6 @@ static struct ibm_struct ibms[] = {
95 .type = ACPI_SYSTEM_NOTIFY,
98 -#ifdef CONFIG_ACPI_IBM_BAY
102 @@ -2364,7 +2358,6 @@ static struct ibm_struct ibms[] = {
103 .handle = &bay_handle,
104 .type = ACPI_SYSTEM_NOTIFY,
110 @@ -2650,9 +2643,7 @@ IBM_PARAM(light);
111 #ifdef CONFIG_ACPI_IBM_DOCK
114 -#ifdef CONFIG_ACPI_IBM_BAY
120 @@ -2735,14 +2726,12 @@ static int __init acpi_ibm_init(void)
121 IBM_HANDLE_INIT(dock);
123 IBM_HANDLE_INIT(pci);
124 -#ifdef CONFIG_ACPI_IBM_BAY
125 IBM_HANDLE_INIT(bay);
127 IBM_HANDLE_INIT(bay_ej);
128 IBM_HANDLE_INIT(bay2);
130 IBM_HANDLE_INIT(bay2_ej);
132 IBM_HANDLE_INIT(beep);
133 IBM_HANDLE_INIT(ecrd);
134 IBM_HANDLE_INIT(ecwr);