diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-01 16:15:29 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-07-01 16:15:29 +0200 |
commit | e9664856c41d9f23b57f878816afcac35d796f4c (patch) | |
tree | e478bed7f7707cf347b75fcc8cb876a0d95c82c7 /kernel-s390x.config | |
parent | d104a54c2b174b6ad3db5976c31f79da069ae9f1 (diff) | |
parent | a51ec6bf05a25bc60f6c51357511f221fca55d35 (diff) | |
download | kernel-e9664856c41d9f23b57f878816afcac35d796f4c.tar.gz kernel-e9664856c41d9f23b57f878816afcac35d796f4c.tar.xz kernel-e9664856c41d9f23b57f878816afcac35d796f4c.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 77669218f..f4eb17728 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2998,8 +2998,6 @@ CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_MS_BLOCK is not set CONFIG_MSDOS_FS=m CONFIG_MSDOS_PARTITION=y -# CONFIG_MSM_GCC_8994 is not set -# CONFIG_MSM_GCC_8998 is not set CONFIG_MSPRO_BLOCK=m CONFIG_MT7601U=m CONFIG_MT7603E=m |