summaryrefslogtreecommitdiffstats
path: root/kernel-s390x.config
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-01-03 08:27:44 -0800
committerLaura Abbott <labbott@redhat.com>2019-01-03 08:28:18 -0800
commitdd000cd2fd91c63e5b4d660ec4f44666a1779716 (patch)
tree7650c96b98efc9051cd2e688d9a04fce03a79c15 /kernel-s390x.config
parentcca46e0b1d2ddbaaa6197f118a0229031cfcd69c (diff)
downloadkernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.tar.gz
kernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.tar.xz
kernel-dd000cd2fd91c63e5b4d660ec4f44666a1779716.zip
Linux v4.20-10911-g645ff1e8e704
Dropped part of the efi-lockdown patchset for IMA until conflicts get resolved.
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r--kernel-s390x.config2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 6dfe92279..971795aeb 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2091,6 +2091,7 @@ CONFIG_INPUT=y
CONFIG_INPUT_YEALINK=m
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
CONFIG_INTEGRITY_AUDIT=y
+# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY=y
# CONFIG_INTEL_IDMA64 is not set
@@ -5409,6 +5410,7 @@ CONFIG_TOUCHSCREEN_MMS114=m
CONFIG_TOUCHSCREEN_MTOUCH=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_RASPBERRYPI_FW is not set
CONFIG_TOUCHSCREEN_RM_TS=m
# CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
# CONFIG_TOUCHSCREEN_S6SY761 is not set