summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2014-07-21 12:53:39 -0500
committerJustin M. Forbes <jforbes@redhat.com>2014-07-21 12:53:39 -0500
commit4ac0f0fa03787fb7d81db603bbf335ee5c010f9d (patch)
tree68b4402fc6e4b532c9f86e183db9ce598427aaf8 /config-generic
parentac6522333e707a158dc14aac3a24c2f7c1ebbc39 (diff)
downloadkernel-4ac0f0fa03787fb7d81db603bbf335ee5c010f9d.tar.gz
kernel-4ac0f0fa03787fb7d81db603bbf335ee5c010f9d.tar.xz
kernel-4ac0f0fa03787fb7d81db603bbf335ee5c010f9d.zip
Linux v3.16-rc6
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 cb3787b1b..d83167ed4 100644
--- a/config-generic
+++ b/config-generic
@@ -1695,13 +1695,13 @@ 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_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
@@ -4641,7 +4641,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