Merge tag 'v3.9-rc3' into drm-intel-next-queued

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

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 38c5078da11d67ea9db98cf936812982b62f313c..92ed9692c47e8f63e4f5bae061f2ed29e62b4e76 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -176,7 +176,6 @@ config ACPI_FAN
 
 config ACPI_DOCK
        bool "Dock"
-       depends on EXPERIMENTAL
        help
          This driver supports ACPI-controlled docking stations and removable
          drive bays such as the IBM Ultrabay and the Dell Module Bay.
@@ -202,7 +201,7 @@ config ACPI_PROCESSOR
          the module will be called processor.
 config ACPI_IPMI
        tristate "IPMI"
-       depends on EXPERIMENTAL && IPMI_SI && IPMI_HANDLER
+       depends on IPMI_SI && IPMI_HANDLER
        default n
        help
          This driver enables the ACPI to access the BMC controller. And it
@@ -214,14 +213,13 @@ config ACPI_IPMI
 
 config ACPI_HOTPLUG_CPU
        bool
-       depends on EXPERIMENTAL && ACPI_PROCESSOR && HOTPLUG_CPU
+       depends on ACPI_PROCESSOR && HOTPLUG_CPU
        select ACPI_CONTAINER
        default y
 
 config ACPI_PROCESSOR_AGGREGATOR
        tristate "Processor Aggregator"
        depends on ACPI_PROCESSOR
-       depends on EXPERIMENTAL
        depends on X86
        help
          ACPI 4.0 defines processor Aggregator, which enables OS to perform
@@ -268,7 +266,8 @@ config ACPI_CUSTOM_DSDT
        default ACPI_CUSTOM_DSDT_FILE != ""
 
 config ACPI_INITRD_TABLE_OVERRIDE
-       bool "ACPI tables can be passed via uncompressed cpio in initrd"
+       bool "ACPI tables override via initrd"
+       depends on BLK_DEV_INITRD && X86
        default n
        help
          This option provides functionality to override arbitrary ACPI tables
@@ -308,7 +307,7 @@ config ACPI_DEBUG_FUNC_TRACE
          is about half of the penalty and is rarely useful.
 
 config ACPI_PCI_SLOT
-       tristate "PCI slot detection driver"
+       bool "PCI slot detection driver"
        depends on SYSFS
        default n
        help
@@ -317,9 +316,6 @@ config ACPI_PCI_SLOT
          i.e., segment/bus/device/function tuples, with physical slots in
          the system.  If you are unsure, say N.
 
-         To compile this driver as a module, choose M here:
-         the module will be called pci_slot.
-
 config X86_PM_TIMER
        bool "Power Management Timer Support" if EXPERT
        depends on X86
@@ -337,8 +333,7 @@ config X86_PM_TIMER
          systems require this timer. 
 
 config ACPI_CONTAINER
-       tristate "Container and Module Devices (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Container and Module Devices"
        default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
        help
          This driver supports ACPI Container and Module devices (IDs