summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-11 13:36:24 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-11 13:36:24 -0400
commita7fb62873e9c07443c920a413add27908562ca76 (patch)
tree78454f4072909a435d3a6bf83f7f7a6c59dc5f3a /config-armv7
parent2a04f7df27e6da73e6af6b25a6da9c9c88d8d4af (diff)
downloadkernel-a7fb62873e9c07443c920a413add27908562ca76.tar.gz
kernel-a7fb62873e9c07443c920a413add27908562ca76.tar.xz
kernel-a7fb62873e9c07443c920a413add27908562ca76.zip
Linux v3.15-7218-g3f17ea6dea8b
- Reenable debugging options.
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv75
1 files changed, 5 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index 4aaa913a6..095c1bc54 100644
--- a/config-armv7
+++ b/config-armv7
@@ -38,6 +38,7 @@ CONFIG_MV643XX_ETH=m
CONFIG_PINCTRL_MVEBU=y
CONFIG_PINCTRL_ARMADA_370=y
CONFIG_PINCTRL_ARMADA_XP=y
+# CONFIG_ARM_ARMADA_370_XP_CPUIDLE is not set
CONFIG_PINCTRL_DOVE=y
CONFIG_EDAC_MV64X60=m
CONFIG_RTC_DRV_S35390A=m
@@ -53,6 +54,7 @@ CONFIG_MMC_SDHCI_DOVE=m
CONFIG_SPI_ORION=m
CONFIG_USB_MV_UDC=m
CONFIG_MVEBU_MBUS=y
+CONFIG_USB_XHCI_MVEBU=m
CONFIG_PHY_MVEBU_SATA=y
CONFIG_ARMADA_THERMAL=m
CONFIG_DOVE_THERMAL=m
@@ -165,6 +167,7 @@ CONFIG_PINCTRL_PALMAS=y
CONFIG_REGULATOR_PALMAS=y
CONFIG_REGULATOR_PBIAS=m
CONFIG_RTC_DRV_PALMAS=m
+CONFIG_OMAP5_DSS_HDMI=y
CONFIG_WL_TI=y
CONFIG_WLCORE_SDIO=m
@@ -351,6 +354,7 @@ CONFIG_SOC_IMX50=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
+# CONFIG_SOC_IMX6SX is not set
# CONFIG_SOC_VF610 is not set
CONFIG_MACH_IMX51_DT=y
# CONFIG_MACH_MX51_BABBAGE is not set
@@ -564,6 +568,7 @@ CONFIG_SND_SOC_TEGRA20_DAS=m
CONFIG_SND_SOC_TEGRA20_SPDIF=m
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_HDA_TEGRA=m
# AC100 (PAZ00)
CONFIG_MFD_NVEC=y