summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-14 08:40:03 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-14 08:41:32 -0400
commit0b12c85af6596ee57731bb7ef0e73ab4b307d661 (patch)
tree4cedc32224c3bbef2a878a44bbcd46266a7205a4 /config-generic
parent60c24aba493c878816eb0c0aa1b70ff6c12bb26e (diff)
downloadkernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.gz
kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.xz
kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.zip
Linux v4.3-rc1
- Disable debugging options. Also rebase the kdbus patches against 4.3-rc1
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic7
1 files changed, 4 insertions, 3 deletions
diff --git a/config-generic b/config-generic
index 6c50a5063..d656cb0b1 100644
--- a/config-generic
+++ b/config-generic
@@ -1783,13 +1783,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
@@ -2453,6 +2453,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
# CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
# CONFIG_TOUCHSCREEN_SX8654 is not set
# CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
+# CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
CONFIG_INPUT_MISC=y
CONFIG_INPUT_E3X0_BUTTON=m
@@ -4989,7 +4990,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