Pull Kconfig into release branch

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 33e2ca847a261434faf3ca8b0dca05883f80e256..2b2fbec14540f8f27d8de0ec5b3b796f226d27c0 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support"
 config ACPI
        bool "ACPI Support"
        depends on IA64 || X86
+       depends on PCI
        select PM
-       select PCI
-
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for 
@@ -205,6 +204,18 @@ config ACPI_IBM
 
          If you have an IBM ThinkPad laptop, say Y or M here.
 
+config ACPI_IBM_DOCK
+       bool "Legacy Docking Station Support"
+       depends on ACPI_IBM
+       default n
+       ---help---
+         Allows the ibm_acpi driver to handle docking station events.
+         This support is obsoleted by CONFIG_HOTPLUG_PCI_ACPI.  It will
+         allow locking and removing the laptop from the docking station,
+         but will not properly connect PCI devices.
+
+         If you are not sure, say N here.
+
 config ACPI_TOSHIBA
        tristate "Toshiba Laptop Extras"
        depends on X86
@@ -244,7 +255,8 @@ config ACPI_CUSTOM_DSDT_FILE
        depends on ACPI_CUSTOM_DSDT
        default ""
        help
-         Enter the full path name to the file wich includes the AmlCode declaration.
+         Enter the full path name to the file which includes the AmlCode
+         declaration.
 
 config ACPI_BLACKLIST_YEAR
        int "Disable ACPI for systems before Jan 1st this year" if X86_32
@@ -316,7 +328,7 @@ config ACPI_CONTAINER
 config ACPI_HOTPLUG_MEMORY
        tristate "Memory Hotplug"
        depends on ACPI
-       depends on MEMORY_HOTPLUG
+       depends on MEMORY_HOTPLUG || X86_64
        default n
        help
          This driver adds supports for ACPI Memory Hotplug.  This driver