diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-07 10:17:40 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-07 10:17:40 +0100 |
| commit | a335eadc22d619df206f02bc207ca3c0dce67db3 (patch) | |
| tree | 177a8fb0f40eb3df4c121f9660f6d2c3f140195f /config-generic | |
| parent | fa67d9c5779bc72f10daada933bbde1c3c2aaecb (diff) | |
| parent | fe324f69901af83cb16ee086f3d284e67ed36e33 (diff) | |
| download | kernel-a335eadc22d619df206f02bc207ca3c0dce67db3.tar.gz kernel-a335eadc22d619df206f02bc207ca3c0dce67db3.tar.xz kernel-a335eadc22d619df206f02bc207ca3c0dce67db3.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc8.git1.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc8.git1.1.vanilla.knurd.1.fc24
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-generic b/config-generic index 76cbc2635..928bd6a3a 100644 --- a/config-generic +++ b/config-generic @@ -1861,13 +1861,13 @@ CONFIG_B43=m CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y CONFIG_B43_BCMA_PIO=y -# CONFIG_B43_DEBUG is not set +CONFIG_B43_DEBUG=y CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_HT=y CONFIG_B43_PHY_G=y CONFIG_B43LEGACY=m -# CONFIG_B43LEGACY_DEBUG is not set +CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -5265,7 +5265,7 @@ CONFIG_PM_DEBUG=y # CONFIG_DPM_WATCHDOG is not set # revisit this in debug CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y -# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_TEST_SUSPEND=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set |