Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 788e88eb18ecc939cfef7629c4c3e60a3d56df93..10c7ad59c0e1bac4df5abb550feafe323b6da2e1 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -51,7 +51,6 @@ config ACPI_PROCFS
          For backwards compatibility, this option allows
          deprecated /proc/acpi/ files to exist, even when
          they have been replaced by functions in /sys.
-         The deprecated files (and their replacements) include:
 
          This option has no effect on /proc/acpi/ files
          and functions which do not yet exist in /sys.
@@ -207,6 +206,17 @@ config ACPI_PROCESSOR
 
          To compile this driver as a module, choose M here:
          the module will be called processor.
+config ACPI_IPMI
+       tristate "IPMI"
+       depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
+       default n
+       help
+         This driver enables the ACPI to access the BMC controller. And it
+         uses the IPMI request/response message to communicate with BMC
+         controller, which can be found on on the server.
+
+         To compile this driver as a module, choose M here:
+         the module will be called as acpi_ipmi.
 
 config ACPI_HOTPLUG_CPU
        bool