[linux] 02/04: cpufreq: Re-enable CPU_FREQ_STAT, which can no longer be modular

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 0fc6a741fc97001115c400ad98d69cf5e47d4b81
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 24 02:26:03 2016 +0100

    cpufreq: Re-enable CPU_FREQ_STAT, which can no longer be modular
---
 debian/changelog         | 6 ++++++
 debian/config/config     | 2 +-
 debian/config/sh4/config | 1 -
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 950736c..6ac91a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux (4.8.4-1~exp2) UNRELEASED; urgency=medium
+
+  * cpufreq: Re-enable CPU_FREQ_STAT, which can no longer be modular
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Mon, 24 Oct 2016 02:25:26 +0100
+
 linux (4.8.4-1~exp1) experimental; urgency=medium
 
   * New upstream release: https://kernelnewbies.org/Linux_4.8
diff --git a/debian/config/config b/debian/config/config
index 4d72e3d..fab66df 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -422,7 +422,7 @@ CONFIG_PROC_EVENTS=y
 ## file: drivers/cpufreq/Kconfig
 ##
 CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 ## choice: Default CPUFreq governor
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index 424d021..25694da 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -36,7 +36,6 @@ CONFIG_CACHE_WRITEBACK=y
 ##
 ## file: drivers/cpufreq/Kconfig
 ##
-CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_SH_CPU_FREQ=y

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git