summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-30 10:10:41 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-30 10:10:41 -0400
commit44fb75f6060af80bcda4d729b18e27c55587d7f3 (patch)
treef445a210a6fbb66ad0e1e55e02938c81584b8210 /config-generic
parent53684dde09db29e637876ca9a1a047d13069d3a6 (diff)
downloadkernel-44fb75f6060af80bcda4d729b18e27c55587d7f3.tar.gz
kernel-44fb75f6060af80bcda4d729b18e27c55587d7f3.tar.xz
kernel-44fb75f6060af80bcda4d729b18e27c55587d7f3.zip
Linux v3.16-rc3
- Enable USB rtsx drivers (rhbz 1114229) - Disable debugging options.
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic10
1 files changed, 6 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index f37aac521..f2f6f2767 100644
--- a/config-generic
+++ b/config-generic
@@ -147,6 +147,7 @@ CONFIG_MMC_CB710=m
CONFIG_MMC_RICOH_MMC=y
CONFIG_MMC_USHC=m
CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_VUB300=m
# CONFIG_MMC_SDHCI_PXAV2 is not set
# CONFIG_MMC_SDHCI_PXAV3 is not set
@@ -1694,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
@@ -3977,6 +3978,7 @@ CONFIG_MFD_VX855=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_RTSX_USB=m
# CONFIG_MFD_TI_AM335X_TSCADC is not set
CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RETU is not set
@@ -4020,7 +4022,6 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_LP3943 is not set
# CONFIG_MFD_BCM590XX is not set
-# CONFIG_MFD_RTSX_USB is not set
# CONFIG_MFD_TPS65218 is not set
@@ -4640,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
@@ -4898,6 +4899,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m
CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
CONFIG_ACCESSIBILITY=y
CONFIG_A11Y_BRAILLE_CONSOLE=y