Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcef5081 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-config' into acpica 

Conflicts:
	include/acpi/platform/aclinux.h
parents d2716578 7919010c

arch/ia64/configs/generic_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/configs/tiger_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/ia64/configs/zx1_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

arch/x86/configs/i386_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ CONFIG_CRASH_DUMP=y 
CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PM_TRACE_RTC=y

CONFIG_ACPI_PROCFS=y

CONFIG_ACPI_DOCK=y

CONFIG_CPU_FREQ=y

# CONFIG_CPU_FREQ_STAT is not set

arch/x86/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ CONFIG_CRASH_DUMP=y 
CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PM_TRACE_RTC=y

CONFIG_ACPI_PROCFS=y

CONFIG_ACPI_DOCK=y

CONFIG_CPU_FREQ=y

# CONFIG_CPU_FREQ_STAT is not set