diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-10 13:18:06 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-10 13:18:06 +0100 |
| commit | 136ffac98979b75444935f1feb5cbbbec006c70d (patch) | |
| tree | 9a78e540fbf3ac220d82d5a4671883912e7d63b1 /kernel-s390x-debug-fedora.config | |
| parent | 5a723baa5d6e286f75543934f721a64211d1fede (diff) | |
| parent | 72913f309d9dbec229f2be563dc676d23125d83f (diff) | |
| download | kernel-136ffac98979b75444935f1feb5cbbbec006c70d.tar.gz kernel-136ffac98979b75444935f1feb5cbbbec006c70d.tar.xz kernel-136ffac98979b75444935f1feb5cbbbec006c70d.zip | |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 6ba4f8021..67d46e3b7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3341,8 +3341,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y |