diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-09 08:18:15 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-02-09 08:18:15 +0100 |
| commit | 27f8b9c3246ea89b4fdd14e44cca941703712295 (patch) | |
| tree | dee6d7cd253ead2311a0dd9cba9563798dd10b6c /config-generic | |
| parent | 57bd4ac2c573d446e8f863ffab06915a920a0fa8 (diff) | |
| parent | 0aec8a810ae657926e533afbe8e13ac523e7d49a (diff) | |
| download | kernel-4.5.0-0.rc3.git0.1.vanilla.knurd.1.fc22.tar.gz kernel-4.5.0-0.rc3.git0.1.vanilla.knurd.1.fc22.tar.xz kernel-4.5.0-0.rc3.git0.1.vanilla.knurd.1.fc22.zip | |
Merge remote-tracking branch 'origin/master' into f22-user-thl-vanilla-rawhidekernel-4.5.0-0.rc3.git0.1.vanilla.knurd.1.fc22
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 2830de78c..7dd27101c 100644 --- a/config-generic +++ b/config-generic @@ -1825,13 +1825,13 @@ CONFIG_B43_PCMCIA=y 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 @@ -5125,7 +5125,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 |