[linux] 05/07: [x86] thermal: Disable THERMAL_OF

[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 5a231207c70a093a465d133f431c0b9f68cb0c7f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Feb 10 01:28:08 2016 +0000

    [x86] thermal: Disable THERMAL_OF
---
 debian/changelog                    | 3 ++-
 debian/config/kernelarch-x86/config | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e81748..2f33e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,7 +75,8 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
   * [x86] rfkill: Enable DELL_RBTN as module
   * serial: Enable SERIAL_OF_PLATFORM as module
   * sound/firewire: Enable SND_FIREWIRE_DIGI00X, SND_FIREWIRE_TASCAM as modules
-  * [x86] thermal: Enable INTEL_PCH_THERMAL, INTEL_SOC_DTS_THERMAL as modules
+  * [x86] thermal: Enable INTEL_PCH_THERMAL, INTEL_SOC_DTS_THERMAL as modules;
+    disable THERMAL_OF
   * [x86] Enable INTEL_PMC_IPC as module
   * vfs,nvdimm: Really enable FS_DAX
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 55f21f1..4307677 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1631,6 +1631,7 @@ CONFIG_PRISM2_USB=m
 ## file: drivers/thermal/Kconfig
 ##
 CONFIG_THERMAL=m
+# CONFIG_THERMAL_OF is not set
 # CONFIG_CPU_THERMAL is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m

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