summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-05-21 08:35:34 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-05-21 08:35:34 -0400
commit58bbe0b0646c0e2ede47af739b864531c4b2366e (patch)
tree8d72ede82121339eacf1eb8a9f11ae86de7b3af4 /config-generic
parent3f7ea9f387523b9b65a362aa9ce48aa6c26f70e5 (diff)
downloadkernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.tar.gz
kernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.tar.xz
kernel-58bbe0b0646c0e2ede47af739b864531c4b2366e.zip
Linux v4.1-rc4-11-g1113cdfe7d2c
- Reenable debugging options. - Add patch to fix discard on md RAID0 (rhbz 1223332)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 3 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 5c5862c74..8c9630d00 100644
--- a/config-generic
+++ b/config-generic
@@ -1723,13 +1723,13 @@ CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_BCMA=y
CONFIG_B43_BCMA_PIO=y
-# CONFIG_B43_DEBUG is not set
+CONFIG_B43_DEBUG=y
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 is not set
+CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
@@ -4821,7 +4821,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 is not set
+CONFIG_PM_TEST_SUSPEND=y
# CONFIG_PM_OPP is not set
# CONFIG_PM_AUTOSLEEP is not set
# CONFIG_PM_WAKELOCKS is not set