diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-21 09:22:39 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-10-21 09:22:39 -0400 |
commit | 27d39a95f697200a2f2d38dac457bd6720d2cd61 (patch) | |
tree | f75c2c0fc6c8b0a214be823a520849fdb2722a1f /config-generic | |
parent | 5917cde9c1fa840708337929886e92865fcb1371 (diff) | |
download | kernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.tar.gz kernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.tar.xz kernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.zip |
Linux v3.18-rc1-68-gc2661b806092
- Make LOG_BUF_SHIFT on arm64 the same as the rest of the arches (rhbz 1123327)
- Enable RTC PL031 driver on arm64 (rhbz 1123882)
- Reenable debugging options.
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 3d42a4272..a0b1820a6 100644 --- a/config-generic +++ b/config-generic @@ -1699,13 +1699,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 @@ -4694,7 +4694,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 |