summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-10-02 10:38:25 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-10-02 10:38:25 +0100
commit54d7d3899256ca76a0ae70ca791c1d804a98a80d (patch)
tree4b2e7bb4943c43df5a40c37039ffbcbf922f2760 /kernel-s390x.config
parente21e52b60843bc2c19b187cd6d25723686a610dc (diff)
downloadkernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.tar.gz
kernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.tar.xz
kernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.zip
initial Arm 5.4 config updates
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 0ae907c13..69ee97c19 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4861,7 +4861,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -5254,7 +5254,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set