diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-09-23 07:50:48 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-09-23 07:50:48 -0700 |
| commit | bb5d04d2ed8405126868693faeaebdca246b0e8b (patch) | |
| tree | 841bfa8a250271bd266257e166b7d560d1f35464 /config-generic | |
| parent | 5ddbd85a50d24a625be6b693961633d6fbccd875 (diff) | |
| parent | 9dcf78723c744f491a2a26226fc63b5b92fd07d2 (diff) | |
| download | kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.tar.gz kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.tar.xz kernel-bb5d04d2ed8405126868693faeaebdca246b0e8b.zip | |
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel into baytrail
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 d91fa659d..7f26b6d53 100644 --- a/config-generic +++ b/config-generic @@ -1730,14 +1730,14 @@ CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y # CONFIG_B43_BCMA_EXTRA is not set 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 is not set # CONFIG_B43_FORCE_PIO is not set 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 @@ -4767,7 +4767,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 |