diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-09 08:56:12 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-09 08:56:12 +0200 |
| commit | 9fbbc87d14436aab7e61120b5b2692773abaf84a (patch) | |
| tree | afe952f9ff2d5cf70cfe52f4591c4e5629cab518 /config-generic | |
| parent | 003bacbdf7e20f8fdeea67a75192d18577a273da (diff) | |
| parent | 82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf (diff) | |
| download | kernel-9fbbc87d14436aab7e61120b5b2692773abaf84a.tar.gz kernel-9fbbc87d14436aab7e61120b5b2692773abaf84a.tar.xz kernel-9fbbc87d14436aab7e61120b5b2692773abaf84a.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc25kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc24kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc23kernel-4.7.0-0.rc6.git2.2.vanilla.knurd.1.fc22
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 8ac3fbb59..32832687f 100644 --- a/config-generic +++ b/config-generic @@ -1837,13 +1837,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 @@ -2640,7 +2640,6 @@ CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set -# CONFIG_SERIAL_MVEBU_UART is not set # CONFIG_ISI is not set # CONFIG_RIO is not set CONFIG_SERIAL_JSM=m @@ -5219,7 +5218,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 |