diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-15 19:50:15 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-03-15 19:50:15 +0100 |
| commit | e781a69ec5d97b73d8ab778c671c5cc4baad22b7 (patch) | |
| tree | 43734adf80ffee37be7609cd51161ccc82412034 /kernel-s390x.config | |
| parent | 41c0bfe47586992f62ce2165329a36ebe503d2a4 (diff) | |
| parent | 2372415c36cda0825310972499fc46cb73869645 (diff) | |
| download | kernel-e781a69ec5d97b73d8ab778c671c5cc4baad22b7.tar.gz kernel-e781a69ec5d97b73d8ab778c671c5cc4baad22b7.tar.xz kernel-e781a69ec5d97b73d8ab778c671c5cc4baad22b7.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc0.git9.1.vanilla.knurd.1.fc31kernel-5.1.0-0.rc0.git9.1.vanilla.knurd.1.fc30kernel-5.1.0-0.rc0.git9.1.vanilla.knurd.1.fc29kernel-5.1.0-0.rc0.git9.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 7c2e3b928..0091f7dab 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -744,6 +744,7 @@ CONFIG_CODA_FS=m # CONFIG_COMMON_CLK_CDCE706 is not set # CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_COMMON_CLK_FIXED_MMIO is not set # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_SI514 is not set @@ -1471,6 +1472,7 @@ CONFIG_FSI_SCOM=m # CONFIG_FSL_ENETC_PTP_CLOCK is not set # CONFIG_FSL_ENETC_VF is not set # CONFIG_FSL_PQ_MDIO is not set +# CONFIG_FSL_QDMA is not set CONFIG_FS_MBCACHE=y CONFIG_FSNOTIFY=y # CONFIG_FTL is not set |