Commit 11891d0e authored Sep 19, 2019 by Greg Kroah-Hartman Committed by Alistair Delva Sep 20, 2019

Revert "FROMLIST: arm64: defconfig: Enable CONFIG_ENERGY_MODEL"



This reverts commit 3a77694c.

We want to back-out the eas-dev merge that happened in the tree after
5.3-rc1 as those patches "should" all be in Linus's tree now.

This is done to handle the merge conflicts with 5.4-rc1.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I07388b025db5a256d463c535adc7df5d79c4ed5d

parent 3803021c

arch/arm64/configs/defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ CONFIG_COMPAT=y
		CONFIG_RANDOMIZE_BASE=y
		CONFIG_HIBERNATION=y
		CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
		CONFIG_ENERGY_MODEL=y
		CONFIG_ARM_CPUIDLE=y
		CONFIG_CPU_FREQ=y
		CONFIG_CPU_FREQ_STAT=y