diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-24 17:49:34 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-24 17:49:49 -0500 |
commit | adc659526c359e43c9760014d4354282f353d50b (patch) | |
tree | 70fc6391d25a21089fc24457d86222ae84c0d219 /config-generic | |
parent | f7bbaa5ad931357b0e53974dd4ebca385802366e (diff) | |
download | kernel-adc659526c359e43c9760014d4354282f353d50b.tar.gz kernel-adc659526c359e43c9760014d4354282f353d50b.tar.xz kernel-adc659526c359e43c9760014d4354282f353d50b.zip |
Linux v4.0-rc1-22-gb24e2bdde4af
- Reenable debugging options.
Fixup one more 3.x place and make sure we don't apply the -rcX patch in yet
another spot.
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 4bf629dad..62726d61a 100644 --- a/config-generic +++ b/config-generic @@ -1717,13 +1717,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 @@ -4784,7 +4784,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_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set |