diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-27 10:08:55 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-04-27 10:09:27 -0400 |
commit | 09bbb44fb1d7a22e5c88703a942328db9fac1488 (patch) | |
tree | fcbc3d851d4355d652cbe4e5b2177d54e7750e14 /config-generic | |
parent | 3d6bd4319e6b5ab2a7ca271685ca2e9d4bc92e4f (diff) | |
download | kernel-09bbb44fb1d7a22e5c88703a942328db9fac1488.tar.gz kernel-09bbb44fb1d7a22e5c88703a942328db9fac1488.tar.xz kernel-09bbb44fb1d7a22e5c88703a942328db9fac1488.zip |
Linux v4.1-rc1
- Disable debugging options.
Fixup a couple of small spots left over from the 3.x->4.x major
version change
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config-generic b/config-generic index 9ec015755..28b1f7e5c 100644 --- a/config-generic +++ b/config-generic @@ -647,6 +647,7 @@ CONFIG_MD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_AUTODETECT=y CONFIG_MD_FAULTY=m +# CONFIG_MD_CLUSTER is not set CONFIG_MD_LINEAR=m CONFIG_MD_MULTIPATH=m CONFIG_MD_RAID0=m @@ -1722,13 +1723,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 @@ -4822,7 +4823,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_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set @@ -5016,6 +5017,7 @@ CONFIG_DW_DMAC_PCI=m CONFIG_ASYNC_TX_DMA=y # CONFIG_HSU_DMA is not set # CONFIG_HSU_DMA_PCI is not set +# CONFIG_XGENE_DMA is not set CONFIG_UNUSED_SYMBOLS=y @@ -5420,7 +5422,7 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m CONFIG_TCM_FC=m -CONFIG_TCM_USER=m +CONFIG_TCM_USER2=m CONFIG_HWSPINLOCK=m |