summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-01-25 10:59:05 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-01-25 10:59:05 -0600
commit04cf44e3c826554975d6f91e36402069c8e931b7 (patch)
tree4665d3e203e887cebfae1f34c21fc2ccb01e08c7 /config-generic
parent4b21efe5dc0af796f42b3d432ed2eebcbb0e6d4a (diff)
downloadkernel-04cf44e3c826554975d6f91e36402069c8e931b7.tar.gz
kernel-04cf44e3c826554975d6f91e36402069c8e931b7.tar.xz
kernel-04cf44e3c826554975d6f91e36402069c8e931b7.zip
Linux v4.5-rc1
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 e4f0a11bd..81e9d78f0 100644
--- a/config-generic
+++ b/config-generic
@@ -1821,13 +1821,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
@@ -5121,7 +5121,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