diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-22 08:26:24 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-22 08:26:24 -0800 |
| commit | 87f9785b4325717c20e15d9847dddcbea472a2d4 (patch) | |
| tree | 68bf50e5f9125a3da17e610f03a5496c2fc1a299 /config-x86-generic | |
| parent | cd2051e50eb862afffdce13da1b05ef6d7c774e1 (diff) | |
| parent | 33fc8e2a5b2a9cde80a0e305ac09085585292e96 (diff) | |
| download | kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.tar.gz kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.tar.xz kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.zip | |
Merge branch 'master' into baytrail
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index 63d46662f..79a3f4482 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -575,7 +575,6 @@ CONFIG_PINCTRL_BAYTRAIL=y # CONFIG_INTEL_POWERCLAMP is not set CONFIG_X86_PKG_TEMP_THERMAL=m -CONFIG_ACPI_INT3403_THERMAL=m CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INT340X_THERMAL=m |