diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-03-16 10:07:00 -0400 |
commit | 9608f11d20f9c69ff4c624dcf421721221599255 (patch) | |
tree | e4ee1f9536259e294f860ed0a371b82e823e6c0f /config-generic | |
parent | cd37906b18022c72b4599cb0af3cfbd1c001499c (diff) | |
download | kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.gz kernel-9608f11d20f9c69ff4c624dcf421721221599255.tar.xz kernel-9608f11d20f9c69ff4c624dcf421721221599255.zip |
Linux v4.0-rc4
- Drop arm64 RCU revert patch. Should be fixed properly upstream now.
- Disable 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 d604dc41b..178306809 100644 --- a/config-generic +++ b/config-generic @@ -1718,13 +1718,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 @@ -4785,7 +4785,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_RUNTIME=y # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set |