summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-03-07 09:50:02 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-03-07 09:50:02 -0600
commitfdf0c70f782179f04101ecfdac336799192d894e (patch)
tree0ad6109d65b86a40e10cade1512bbece9555faee /config-generic
parent6c5f57724d3d864702786dc17c33ff45915c6b1e (diff)
downloadkernel-fdf0c70f782179f04101ecfdac336799192d894e.tar.gz
kernel-fdf0c70f782179f04101ecfdac336799192d894e.tar.xz
kernel-fdf0c70f782179f04101ecfdac336799192d894e.zip
Linux v4.5-rc7
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 30f00b23b..1300bd015 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
@@ -5132,7 +5132,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