diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2007-01-11 02:58:15 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-01-11 02:58:15 -0500 |
commit | d2fadbbbf0e42b842731da71864f222e7f119461 (patch) | |
tree | 6f63405a69720e45b2c74209b5b6c93cfbd64db1 /drivers/acpi/Kconfig | |
parent | 8f6d63adf8309a412bf2d3d2e49a85e519ebf57c (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/Kconfig')
-rw-r--r-- | drivers/acpi/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 1639998e4d27..f4f000abc4e9 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -225,17 +225,6 @@ config ACPI_IBM_DOCK | |||
225 | 225 | ||
226 | If you are not sure, say N here. | 226 | If you are not sure, say N here. |
227 | 227 | ||
228 | config ACPI_IBM_BAY | ||
229 | bool "Legacy Removable Bay Support" | ||
230 | depends on ACPI_IBM | ||
231 | depends on ACPI_BAY=n | ||
232 | default n | ||
233 | ---help--- | ||
234 | Allows the ibm_acpi driver to handle removable bays. | ||
235 | This support is obsoleted by CONFIG_ACPI_BAY. | ||
236 | |||
237 | If you are not sure, say N here. | ||
238 | |||
239 | config ACPI_TOSHIBA | 228 | config ACPI_TOSHIBA |
240 | tristate "Toshiba Laptop Extras" | 229 | tristate "Toshiba Laptop Extras" |
241 | depends on X86 | 230 | depends on X86 |