diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:25:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 18:25:44 -0800 |
| commit | e947382ed38563544d2b5b79f6ea90bdde350e5e (patch) | |
| tree | b09380b54bc2ef3841e6568fbf98fbb8f7706de8 /drivers/acpi/Kconfig | |
| parent | 5b94d541806da24c8dbbff629486d65ce71dec46 (diff) | |
| parent | d2fadbbbf0e42b842731da71864f222e7f119461 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
Revert "ACPI: ibm-acpi: make non-generic bay support optional"
ACPI: update MAINTAINERS
ACPI: schedule obsolete features for deletion
ACPI: delete two spurious ACPI messages
ACPI: rename cstate_entry_s to cstate_entry
ACPI: ec: enable printk on cmdline use
ACPI: Altix: ACPI _PRT support
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 1639998e4d2..f4f000abc4e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -225,17 +225,6 @@ config ACPI_IBM_DOCK If you are not sure, say N here. -config ACPI_IBM_BAY - bool "Legacy Removable Bay Support" - depends on ACPI_IBM - depends on ACPI_BAY=n - default n - ---help--- - Allows the ibm_acpi driver to handle removable bays. - This support is obsoleted by CONFIG_ACPI_BAY. - - If you are not sure, say N here. - config ACPI_TOSHIBA tristate "Toshiba Laptop Extras" depends on X86 |