aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ibm_acpi.c
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2007-01-11 02:58:15 -0500
committerLen Brown <len.brown@intel.com>2007-01-11 02:58:15 -0500
commitd2fadbbbf0e42b842731da71864f222e7f119461 (patch)
tree6f63405a69720e45b2c74209b5b6c93cfbd64db1 /drivers/acpi/ibm_acpi.c
parent8f6d63adf8309a412bf2d3d2e49a85e519ebf57c (diff)
Revert "ACPI: ibm-acpi: make non-generic bay support optional"
This reverts commit 2df910b4c3edcce9a0c12394db6f5f4a6e69c712. ACPI_BAY has not been merged into mainline yet, so the changes to ibm-acpi related Kconfig entries that depend on ACPI_BAY were permanently disabling ibm-acpi bay support. This is a serious regression for ThinkPad users. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ibm_acpi.c')
-rw-r--r--drivers/acpi/ibm_acpi.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index b72d13d11a27..c6144ca66638 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -157,7 +157,6 @@ IBM_HANDLE(dock, root, "\\_SB.GDCK", /* X30, X31, X40 */
157 "\\_SB.PCI.ISA.SLCE", /* 570 */ 157 "\\_SB.PCI.ISA.SLCE", /* 570 */
158 ); /* A21e,G4x,R30,R31,R32,R40,R40e,R50e */ 158 ); /* A21e,G4x,R30,R31,R32,R40,R40e,R50e */
159#endif 159#endif
160#ifdef CONFIG_ACPI_IBM_BAY
161IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST", /* 570 */ 160IBM_HANDLE(bay, root, "\\_SB.PCI.IDE.SECN.MAST", /* 570 */
162 "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */ 161 "\\_SB.PCI0.IDE0.IDES.IDSM", /* 600e/x, 770e, 770x */
163 "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */ 162 "\\_SB.PCI0.SATA.SCND.MSTR", /* T60, X60, Z60 */
@@ -175,7 +174,6 @@ IBM_HANDLE(bay2, root, "\\_SB.PCI0.IDE0.PRIM.SLAV", /* A3x, R32 */
175IBM_HANDLE(bay2_ej, bay2, "_EJ3", /* 600e/x, 770e, A3x */ 174IBM_HANDLE(bay2_ej, bay2, "_EJ3", /* 600e/x, 770e, A3x */
176 "_EJ0", /* 770x */ 175 "_EJ0", /* 770x */
177 ); /* all others */ 176 ); /* all others */
178#endif
179 177
180/* don't list other alternatives as we install a notify handler on the 570 */ 178/* don't list other alternatives as we install a notify handler on the 570 */
181IBM_HANDLE(pci, root, "\\_SB.PCI"); /* 570 */ 179IBM_HANDLE(pci, root, "\\_SB.PCI"); /* 570 */
@@ -1042,7 +1040,6 @@ static int light_write(char *buf)
1042 return 0; 1040 return 0;
1043} 1041}
1044 1042
1045#if defined(CONFIG_ACPI_IBM_DOCK) || defined(CONFIG_ACPI_IBM_BAY)
1046static int _sta(acpi_handle handle) 1043static int _sta(acpi_handle handle)
1047{ 1044{
1048 int status; 1045 int status;
@@ -1052,7 +1049,7 @@ static int _sta(acpi_handle handle)
1052 1049
1053 return status; 1050 return status;
1054} 1051}
1055#endif 1052
1056#ifdef CONFIG_ACPI_IBM_DOCK 1053#ifdef CONFIG_ACPI_IBM_DOCK
1057#define dock_docked() (_sta(dock_handle) & 1) 1054#define dock_docked() (_sta(dock_handle) & 1)
1058 1055
@@ -1118,7 +1115,6 @@ static void dock_notify(struct ibm_struct *ibm, u32 event)
1118} 1115}
1119#endif 1116#endif
1120 1117
1121#ifdef CONFIG_ACPI_IBM_BAY
1122static int bay_status_supported; 1118static int bay_status_supported;
1123static int bay_status2_supported; 1119static int bay_status2_supported;
1124static int bay_eject_supported; 1120static int bay_eject_supported;
@@ -1194,7 +1190,6 @@ static void bay_notify(struct ibm_struct *ibm, u32 event)
1194{ 1190{
1195 acpi_bus_generate_event(ibm->device, event, 0); 1191 acpi_bus_generate_event(ibm->device, event, 0);
1196} 1192}
1197#endif
1198 1193
1199static int cmos_read(char *p) 1194static int cmos_read(char *p)
1200{ 1195{
@@ -2354,7 +2349,6 @@ static struct ibm_struct ibms[] = {
2354 .type = ACPI_SYSTEM_NOTIFY, 2349 .type = ACPI_SYSTEM_NOTIFY,
2355 }, 2350 },
2356#endif 2351#endif
2357#ifdef CONFIG_ACPI_IBM_BAY
2358 { 2352 {
2359 .name = "bay", 2353 .name = "bay",
2360 .init = bay_init, 2354 .init = bay_init,
@@ -2364,7 +2358,6 @@ static struct ibm_struct ibms[] = {
2364 .handle = &bay_handle, 2358 .handle = &bay_handle,
2365 .type = ACPI_SYSTEM_NOTIFY, 2359 .type = ACPI_SYSTEM_NOTIFY,
2366 }, 2360 },
2367#endif
2368 { 2361 {
2369 .name = "cmos", 2362 .name = "cmos",
2370 .read = cmos_read, 2363 .read = cmos_read,
@@ -2650,9 +2643,7 @@ IBM_PARAM(light);
2650#ifdef CONFIG_ACPI_IBM_DOCK 2643#ifdef CONFIG_ACPI_IBM_DOCK
2651IBM_PARAM(dock); 2644IBM_PARAM(dock);
2652#endif 2645#endif
2653#ifdef CONFIG_ACPI_IBM_BAY
2654IBM_PARAM(bay); 2646IBM_PARAM(bay);
2655#endif
2656IBM_PARAM(cmos); 2647IBM_PARAM(cmos);
2657IBM_PARAM(led); 2648IBM_PARAM(led);
2658IBM_PARAM(beep); 2649IBM_PARAM(beep);
@@ -2735,14 +2726,12 @@ static int __init acpi_ibm_init(void)
2735 IBM_HANDLE_INIT(dock); 2726 IBM_HANDLE_INIT(dock);
2736#endif 2727#endif
2737 IBM_HANDLE_INIT(pci); 2728 IBM_HANDLE_INIT(pci);
2738#ifdef CONFIG_ACPI_IBM_BAY
2739 IBM_HANDLE_INIT(bay); 2729 IBM_HANDLE_INIT(bay);
2740 if (bay_handle) 2730 if (bay_handle)
2741 IBM_HANDLE_INIT(bay_ej); 2731 IBM_HANDLE_INIT(bay_ej);
2742 IBM_HANDLE_INIT(bay2); 2732 IBM_HANDLE_INIT(bay2);
2743 if (bay2_handle) 2733 if (bay2_handle)
2744 IBM_HANDLE_INIT(bay2_ej); 2734 IBM_HANDLE_INIT(bay2_ej);
2745#endif
2746 IBM_HANDLE_INIT(beep); 2735 IBM_HANDLE_INIT(beep);
2747 IBM_HANDLE_INIT(ecrd); 2736 IBM_HANDLE_INIT(ecrd);
2748 IBM_HANDLE_INIT(ecwr); 2737 IBM_HANDLE_INIT(ecwr);