diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-24 07:31:15 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-11-24 07:31:15 +0100 |
| commit | 5f1b93ee30c89a1f9f3394444462584f4f84761c (patch) | |
| tree | ce8888a8448f63c6bdd2ff962db3a317a0b09a26 /config-generic | |
| parent | 2005519903a556edd592c237c2514be8842ae1d0 (diff) | |
| parent | 38c76ac35533ae3c8ffd98c03843a278d8a464f4 (diff) | |
| download | kernel-5f1b93ee30c89a1f9f3394444462584f4f84761c.tar.gz kernel-5f1b93ee30c89a1f9f3394444462584f4f84761c.tar.xz kernel-5f1b93ee30c89a1f9f3394444462584f4f84761c.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.9.0-0.rc6.git2.1.vanilla.knurd.1.fc26kernel-4.9.0-0.rc6.git2.1.vanilla.knurd.1.fc25kernel-4.9.0-0.rc6.git2.1.vanilla.knurd.1.fc24kernel-4.9.0-0.rc6.git2.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 77da44a07..36600d849 100644 --- a/config-generic +++ b/config-generic @@ -1858,13 +1858,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 @@ -5276,7 +5276,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 |