summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-26 10:11:52 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-26 10:11:52 -0400
commitdbc4098dbceb470d7f4dbb11d0ad64d1100ed544 (patch)
tree678e48337bd23645662f7e1a9b560d1e22fa4b12 /config-generic
parent96dba40a7714f4feaac45f76e3701fb3c2d822da (diff)
downloadkernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.tar.gz
kernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.tar.xz
kernel-dbc4098dbceb470d7f4dbb11d0ad64d1100ed544.zip
Linux v3.17-rc2
- Fixup ARM MFD options after I2C=y change - 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 1b10c6c82..8e28e126b 100644
--- a/config-generic
+++ b/config-generic
@@ -1727,14 +1727,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
@@ -4760,7 +4760,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