summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-07-14 09:39:24 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-07-14 09:39:53 -0400
commit7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56 (patch)
tree93dfb6097f882bcee6ac333064f7236897b73b1f /config-generic
parentd23e5375ca546a628959202000ad12acf4e6331e (diff)
downloadkernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.tar.gz
kernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.tar.xz
kernel-7c50c7da7edb2b5aa3d8753d1a3cf2cc7af43e56.zip
Linux v3.16-rc5
- Fix i915 regression with external monitors (rhbz 1117008) - Disable debugging options.
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 c6adc57dd..f2f6f2767 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