From 09bbb44fb1d7a22e5c88703a942328db9fac1488 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Mon, 27 Apr 2015 10:08:55 -0400
Subject: Linux v4.1-rc1

- Disable debugging options.

Fixup a couple of small spots left over from the 3.x->4.x major
version change
---
 config-generic | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'config-generic')

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
 
-- 
cgit