summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-27 07:44:55 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-27 07:47:54 -0700
commita211bbb3e5374116fe1d13d13508f8c8f5a0ca56 (patch)
treed157df4374684fc14400ac1f6a74efee15dafe1f /config-generic
parentbf545878d085d20b9635929a715ef8f94febf049 (diff)
downloadkernel-a211bbb3e5374116fe1d13d13508f8c8f5a0ca56.tar.gz
kernel-a211bbb3e5374116fe1d13d13508f8c8f5a0ca56.tar.xz
kernel-a211bbb3e5374116fe1d13d13508f8c8f5a0ca56.zip
Linux v4.6-11010-gdc03c0f
- Kconfig, Kbuild, ceph, nfs, xfs, mmc, hwmon merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index c08fb2e99..8ea0e844d 100644
--- a/config-generic
+++ b/config-generic
@@ -5491,6 +5491,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_TEST_POWER is not set
CONFIG_APM_POWER=m
# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_GENERIC_ADC_THERMAL is not set
# CONFIG_WM831X_POWER is not set
# CONFIG_BATTERY_DS2760 is not set