diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-09 08:09:56 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-09 08:09:56 +0100 |
| commit | bdd76babc0a034836c077667a8758f60e3f84ea4 (patch) | |
| tree | 139719c2b732391d7da9b6d4214871ce0a5a23f4 /config-generic | |
| parent | 2ae9a8e221c7dfdc6c078e41b0b90209fc11df23 (diff) | |
| parent | 93a8912463a2ffa7994fa2182b4a6b666d27bec0 (diff) | |
| download | kernel-bdd76babc0a034836c077667a8758f60e3f84ea4.tar.gz kernel-bdd76babc0a034836c077667a8758f60e3f84ea4.tar.xz kernel-bdd76babc0a034836c077667a8758f60e3f84ea4.zip | |
Merge branch 'master' into f23-user-thl-vanilla-rawhidekernel-4.4.0-0.rc8.git3.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 48837af22..6c999c510 100644 --- a/config-generic +++ b/config-generic @@ -1799,13 +1799,13 @@ CONFIG_B43_PCMCIA=y 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 @@ -5046,7 +5046,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 |