diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-10 19:19:59 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-10 19:19:59 +0100 |
commit | 8ce5292cca7e27faa272974c2ccd6edb5c352301 (patch) | |
tree | f0719f86c203fa4ee62d8790cc63579c5dfcc424 /kernel-s390x-debug-fedora.config | |
parent | 1c4fc42e6c7d1369d56373ae22373cd389af4ca2 (diff) | |
parent | 3cdb1db179700bb87f57c3b545772d31485c5923 (diff) | |
download | kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.tar.gz kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.tar.xz kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc1.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r-- | kernel-s390x-debug-fedora.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1f1cddad0..bc424312b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -288,7 +288,7 @@ CONFIG_AUTOFS4_FS=y CONFIG_AUTOFS_FS=y # CONFIG_AUXDISPLAY is not set CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796B_PHY=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y |