summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-02-21 16:09:17 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-02-21 16:09:17 -0600
commit1f3ef36b870f074863dbd9d9170ee5ad4a398777 (patch)
tree8eba6fca2a63021cd3c33f6c27523e28cf4c1478 /config-generic
parent77aabbff1fcd6b41adbe7feb8f9302183fe250c0 (diff)
downloadkernel-1f3ef36b870f074863dbd9d9170ee5ad4a398777.tar.gz
kernel-1f3ef36b870f074863dbd9d9170ee5ad4a398777.tar.xz
kernel-1f3ef36b870f074863dbd9d9170ee5ad4a398777.zip
Linux v4.5-rc5
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 7ce5b5d33..9eef87601 100644
--- a/config-generic
+++ b/config-generic
@@ -1825,13 +1825,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
@@ -5127,7 +5127,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