summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-09-22 16:08:53 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-09-22 16:08:53 -0400
commitf4cf24d4582d109fde54e239ef2275385e5271de (patch)
treeb4868435328f6f96be731a74e9dcec2b68205dc3 /config-generic
parentdaec5ad199c2becf783a47c65bb032621d3c5766 (diff)
downloadkernel-f4cf24d4582d109fde54e239ef2275385e5271de.tar.gz
kernel-f4cf24d4582d109fde54e239ef2275385e5271de.tar.xz
kernel-f4cf24d4582d109fde54e239ef2275385e5271de.zip
Linux v3.17-rc6
- Revert EFI GOT fixes as it causes boot failures - 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 56f540e95..3f129610a 100644
--- a/config-generic
+++ b/config-generic
@@ -1730,14 +1730,14 @@ 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_PHY_G is not set
# 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
@@ -4764,7 +4764,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