summarylogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authornemaeon2015-08-12 00:19:06 -0400
committernemaeon2015-08-12 00:19:06 -0400
commit2b9229c607027fc1a175f965e56c60c11f77053c (patch)
treed560d1955b392ad8cd492c01bb036458c766f767 /config
parent43135f4ff652b454b95026d9ddf2b62391cd1a2d (diff)
downloadaur-2b9229c607027fc1a175f965e56c60c11f77053c.tar.gz
Update to Linux-4.1.5 and CK2 patchset
Diffstat (limited to 'config')
-rw-r--r--config5
1 files changed, 2 insertions, 3 deletions
diff --git a/config b/config
index 8efabc3b5c92..4e9ad6da7bcd 100644
--- a/config
+++ b/config
@@ -6345,8 +6345,8 @@ CONFIG_PVPANIC=m
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m
CONFIG_CHROMEOS_PSTORE=m
-# CONFIG_CROS_EC_CHARDEV is not set
-# CONFIG_CROS_EC_LPC is not set
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LPC=m
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -6466,7 +6466,6 @@ CONFIG_KXCJK1013=m
# CONFIG_AD7887 is not set
# CONFIG_AD7923 is not set
# CONFIG_AD799X is not set
-# CONFIG_CC10001_ADC is not set
# CONFIG_MAX1027 is not set
# CONFIG_MAX1363 is not set
# CONFIG_MCP320X is not set