diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-15 07:20:38 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-15 07:20:38 +0100 |
| commit | a281c96353e5158f12161f9e88d556db977a9e58 (patch) | |
| tree | ae696deda55d6b91571e92a5a38cf3f233b99d81 /config-generic | |
| parent | 54398d2622e81b77d652603e5bf217a7153fd2fb (diff) | |
| parent | 30f2fba936c3d31baea9429b0c0f2ed7b0c4d897 (diff) | |
| download | kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc23.tar.gz kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc23.tar.xz kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc23.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc5.git0.1.vanilla.knurd.1.fc23
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 6b141c94a..6ae82b386 100644 --- a/config-generic +++ b/config-generic @@ -1865,13 +1865,13 @@ CONFIG_B43=m CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y CONFIG_B43_BCMA_PIO=y -CONFIG_B43_DEBUG=y +# CONFIG_B43_DEBUG is not set 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=y +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -5304,7 +5304,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=y +# CONFIG_PM_TEST_SUSPEND is not set # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set |