diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:24 +0100 |
| commit | 75c44eddcb4989b85826143bc09fd3ad120abd4e (patch) | |
| tree | 13136da91a17c8e3970b2201bdc1f7b412cf3989 /arch/ia64 | |
| parent | 6621c5a69a1dac50852ef09d5cf33154a174805a (diff) | |
| parent | 7919010c4224e07b871f3b5513d245cc029fcd67 (diff) | |
| download | linux-75c44eddcb4989b85826143bc09fd3ad120abd4e.tar.bz2 | |
Merge branch 'acpi-config'
* acpi-config:
ACPI: Remove Kconfig symbol ACPI_PROCFS
ACPI / APEI: Remove X86 redundant dependency for APEI GHES.
ACPI: introduce CONFIG_ACPI_REDUCED_HARDWARE_ONLY
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/configs/generic_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/tiger_defconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/configs/zx1_defconfig | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig index efbd2929aeb7..f4a0daa556eb 100644 --- a/arch/ia64/configs/generic_defconfig +++ b/arch/ia64/configs/generic_defconfig @@ -25,7 +25,6 @@ CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y CONFIG_EFI_VARS=y CONFIG_BINFMT_MISC=m -CONFIG_ACPI_PROCFS=y CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 0f4e9e41f130..0fed9ae5a42a 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig @@ -26,7 +26,6 @@ CONFIG_IA64_PALINFO=y CONFIG_KEXEC=y CONFIG_EFI_VARS=y CONFIG_BINFMT_MISC=m -CONFIG_ACPI_PROCFS=y CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m CONFIG_ACPI_PROCESSOR=m diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index fc7aba07c2b4..54bc72eda30d 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig @@ -16,7 +16,6 @@ CONFIG_IA64_PALINFO=y CONFIG_CRASH_DUMP=y CONFIG_EFI_VARS=y CONFIG_BINFMT_MISC=y -CONFIG_ACPI_PROCFS=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y CONFIG_PACKET=y |