summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-28 01:15:55 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-28 01:15:55 +0100
commitc0ced86d38f418448dce1ca8a825dfd16ee9a23a (patch)
tree30b2a6bd07fc88098b559ecc697cb1d35acac953 /drivers/acpi/Kconfig
parent9183ea62f71484dd2e91e313b766adeb15789f90 (diff)
parent50065300314e95c945665a17febc0c4e02941b06 (diff)
downloadlinux-c0ced86d38f418448dce1ca8a825dfd16ee9a23a.tar.bz2
Merge branch 'acpi-ipmi'
* acpi-ipmi: ACPI / IPMI: Cleanup coding styles ACPI / IPMI: Cleanup some Kconfig codes ACPI / IPMI: Cleanup some inclusion codes ACPI / IPMI: Cleanup some initialization codes ACPI / IPMI: Cleanup several acpi_ipmi_device members ACPI / IPMI: Add reference counting for ACPI IPMI transfers ACPI / IPMI: Use global IPMI operation region handler ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI user ACPI / IPMI: Fix race caused by the timed out ACPI IPMI transfers ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI transfers ACPI / IPMI: Fix potential response buffer overflow
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 10e399f97189..589da059ce39 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -158,9 +158,10 @@ 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 IPMI_SI && IPMI_HANDLER
+ depends on IPMI_SI
default n
help
This driver enables the ACPI to access the BMC controller. And it