diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 11:23:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 11:23:16 +1100 |
| commit | 15c82cc6d38c25bf75cb937ef28695a0c9ec2c4d (patch) | |
| tree | 9cd67aba5731d822420d9f3ce3f2cd1daccef798 /arch/powerpc | |
| parent | 6ddf364adb983c36717715694709a53385c52633 (diff) | |
| parent | 7b91cae1696110752136a54edce190d990754189 (diff) | |
Merge remote-tracking branch 'pm/linux-next'
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 3ce91a3df27f..1d2d69dd6409 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -62,7 +62,6 @@ CONFIG_MPC8610_HPCD=y CONFIG_GEF_SBC610=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m |