summaryrefslogtreecommitdiff
path: root/extra/linux-zen/config
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2018-07-18 14:49:27 +0000
committerAndreas Baumann <mail@andreasbaumann.cc>2018-07-18 14:49:27 +0000
commitecf507dfe8456d8c249156cfadafef195980fea7 (patch)
tree3b76da2777072c6bd868b88595dd14c17c98fc4b /extra/linux-zen/config
parent86ba2a97029ade5651025fffae8535302f8eca4e (diff)
parentf5730724bc6eb0f4d190cb59599ee65201ffe20c (diff)
downloadpackages-ecf507dfe8456d8c249156cfadafef195980fea7.tar.xz
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen/config')
-rw-r--r--extra/linux-zen/config7
1 files changed, 3 insertions, 4 deletions
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index f66c880c..7ef4698b 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.5-1 Kernel Configuration
+# Linux/x86 4.17.8-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -6390,7 +6390,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
-CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
@@ -6908,7 +6908,7 @@ CONFIG_USB_SERIAL_WISHBONE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
CONFIG_USB_SERIAL_UPD78F0730=m
-# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_DEBUG=m
#
# USB Miscellaneous drivers
@@ -9395,7 +9395,6 @@ CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
CONFIG_CRYPTO_CHACHA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m