diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-16 07:36:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-06-16 07:36:48 +0200 |
| commit | 7f19568dcacab78c37982c5d487f62a4aee2790f (patch) | |
| tree | 5b7ad07df04b440a5aba513177f3e41c520dde0b /kernel-s390x.config | |
| parent | 30f2fcd150750de9fb6b82d005b88e8f333cd088 (diff) | |
| parent | add9f855221decd12ed1a4575985e629f269c71d (diff) | |
| download | kernel-7f19568dcacab78c37982c5d487f62a4aee2790f.tar.gz kernel-7f19568dcacab78c37982c5d487f62a4aee2790f.tar.xz kernel-7f19568dcacab78c37982c5d487f62a4aee2790f.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc5.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x.config')
| -rw-r--r-- | kernel-s390x.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 23f78a773..89e845b6a 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -273,8 +273,8 @@ CONFIG_AX25_DAMA_SLAVE=y CONFIG_AX25=m CONFIG_B43_BCMA_PIO=y CONFIG_B43_BCMA=y -CONFIG_B43_DEBUG=y -CONFIG_B43LEGACY_DEBUG=y +# CONFIG_B43_DEBUG is not set +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set CONFIG_B43LEGACY_DMA=y |