summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2014-04-02 08:21:25 -0400
committerJosh Boyer <jwboyer@redhat.com>2014-04-02 08:21:25 -0400
commit9ed75fbd4f54d1ce199cdda951141662475c182a (patch)
tree31ee3b91f7a3d50535baedbf9517199f62f043ff /config-armv7
parent9969f4229cb12c59b85a05173822dbd70f5e931e (diff)
downloadkernel-9ed75fbd4f54d1ce199cdda951141662475c182a.tar.gz
kernel-9ed75fbd4f54d1ce199cdda951141662475c182a.tar.xz
kernel-9ed75fbd4f54d1ce199cdda951141662475c182a.zip
Linux v3.14-3893-gc12e69c6aaf7
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv73
1 files changed, 3 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index d609bc65d..09d5bc52c 100644
--- a/config-armv7
+++ b/config-armv7
@@ -51,6 +51,7 @@ CONFIG_MVEBU_MBUS=y
CONFIG_PHY_MVEBU_SATA=y
CONFIG_ARMADA_THERMAL=m
CONFIG_DRM_ARMADA=m
+# CONFIG_SND_KIRKWOOD_SOC is not set
# omap
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
@@ -382,6 +383,7 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_WM8962=m
CONFIG_SND_SOC_IMX_MC13783=m
CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_EUKREA_TLV320=m
CONFIG_USB_IMX21_HCD=m
CONFIG_USB_MXS_PHY=m
@@ -569,6 +571,7 @@ CONFIG_DRM_TEGRA_STAGING=y
CONFIG_DRM_PANEL=y
CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_TEGRA_WATCHDOG=m
CONFIG_CRYPTO_DEV_TEGRA_AES=m