diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-26 10:40:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-07-26 10:40:00 +0200 |
| commit | 68203a666a4e9a3565c2cfb04a83b92cdfff1d4d (patch) | |
| tree | 8d5ec2c6b0e29c6e98adf8358d31b02367130084 /config-generic | |
| parent | 6a5a3287e055bd6870da642d35a7fe31a03eeb13 (diff) | |
| parent | 9ffde4b8e9a353ed0d3d3c846d298e272a5484f9 (diff) | |
| download | kernel-4.7.0-1.vanilla.knurd.1.fc25.tar.gz kernel-4.7.0-1.vanilla.knurd.1.fc25.tar.xz kernel-4.7.0-1.vanilla.knurd.1.fc25.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-1.vanilla.knurd.1.fc25kernel-4.7.0-1.vanilla.knurd.1.fc24kernel-4.7.0-1.vanilla.knurd.1.fc23kernel-4.7.0-1.vanilla.knurd.1.fc22
Conflicts:
kernel.spec
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 32832687f..82db0f623 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=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 @@ -5218,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=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 |