Merge branch 'bugzilla-11312' into release

[mv-sheeva.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 325b4b5fa7dfa53e505439d3ea85e7fd6adcb6dc..f4f6329175094383e61749a6dbf893a3ecda92d9 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -157,18 +157,11 @@ config ACPI_FAN
          applications to perform basic fan control (on, off, status).
 
 config ACPI_DOCK
-       tristate "Dock"
+       bool "Dock"
        depends on EXPERIMENTAL
        help
-         This driver adds support for ACPI controlled docking stations
-
-config ACPI_BAY
-       tristate "Removable Drive Bay (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
-       depends on ACPI_DOCK
-       help
-         This driver adds support for ACPI controlled removable drive
-         bays such as the IBM ultrabay or the Dell Module Bay.
+         This driver adds support for ACPI controlled docking stations and removable
+         drive bays such as the IBM ultrabay or the Dell Module Bay.
 
 config ACPI_PROCESSOR
        tristate "Processor"
@@ -260,6 +253,9 @@ config ACPI_ASUS
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86 && INPUT
+       select INPUT_POLLDEV
+       select NET
+       select RFKILL
        select BACKLIGHT_CLASS_DEVICE
        ---help---
          This driver adds support for access to certain system settings