diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 04:53:28 +0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 04:53:28 +0400 |
commit | bcef50814c9de8e0672d3e7f9f1abd85e1b95d13 (patch) | |
tree | 751337a429d58b60e03e22d2a30fccd87e1bc02a /arch/ia64/configs/generic_defconfig | |
parent | d2716578e439a5a693d0817e8ab89802b33b4ded (diff) | |
parent | 7919010c4224e07b871f3b5513d245cc029fcd67 (diff) | |
download | linux-bcef50814c9de8e0672d3e7f9f1abd85e1b95d13.tar.xz |
Merge branch 'acpi-config' into acpica
Conflicts:
include/acpi/platform/aclinux.h
Diffstat (limited to 'arch/ia64/configs/generic_defconfig')
-rw-r--r-- | arch/ia64/configs/generic_defconfig | 1 |
1 files changed, 0 insertions, 1 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 |