Merge commit 'v2.6.28-rc7' into core/locking

[linux-2.6-block.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index cbfc58d6023676bc14d36c6b7eb9fcf9d745ef67..b0243fd55ac00716d57037cd01c3a67cddb517c1 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -157,7 +157,7 @@ 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 and removable
@@ -253,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
@@ -309,9 +312,13 @@ config ACPI_DEBUG
        bool "Debug Statements"
        default n
        help
-         The ACPI driver can optionally report errors with a great deal
-         of verbosity. Saying Y enables these statements. This will increase
-         your kernel size by around 50K.
+         The ACPI subsystem can produce debug output.  Saying Y enables this
+         output and increases the kernel size by around 50K.
+
+         Use the acpi.debug_layer and acpi.debug_level kernel command-line
+         parameters documented in Documentation/acpi/debug.txt and
+         Documentation/kernel-parameters.txt to control the type and
+         amount of debug output.
 
 config ACPI_DEBUG_FUNC_TRACE
        bool "Additionally enable ACPI function tracing"
@@ -321,14 +328,6 @@ config ACPI_DEBUG_FUNC_TRACE
          ACPI Debug Statements slow down ACPI processing. Function trace
          is about half of the penalty and is rarely useful.
 
-config ACPI_EC
-       bool
-       default y
-       help
-         This driver is required on some systems for the proper operation of
-         the battery and thermal drivers.  If you are compiling for a 
-         mobile system, say Y.
-
 config ACPI_PCI_SLOT
        tristate "PCI slot detection driver"
        default n
@@ -338,10 +337,6 @@ config ACPI_PCI_SLOT
          help you correlate PCI bus addresses with the physical geography
          of your slots. If you are unsure, say N.
 
-config ACPI_POWER
-       bool
-       default y
-
 config ACPI_SYSTEM
        bool
        default y