diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-10 19:31:40 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-10 19:31:40 -0800 |
| commit | cd2051e50eb862afffdce13da1b05ef6d7c774e1 (patch) | |
| tree | 4415af7b40d8d89d20a2eb6ca8158ffaba0f9b44 /config-generic | |
| parent | a2d7a54b90ef3d379c3bbb12b4b0e959dab27b14 (diff) | |
| parent | 09115662e15ee83248e62465fead50be5ed85f79 (diff) | |
| download | kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.tar.gz kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.tar.xz kernel-cd2051e50eb862afffdce13da1b05ef6d7c774e1.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 bd6568f52..0a4865c01 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=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 @@ -4697,7 +4697,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 |