From 700baa35a69ec9d7b1bbd5551366a24560334451 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Thu, 10 Apr 2014 09:38:28 -0400
Subject: Linux v3.14-12042-g69cd9eba3886

---
 config-armv7 | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'config-armv7')

diff --git a/config-armv7 b/config-armv7
index bd0598311..d085f236f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -24,6 +24,8 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
+# CONFIG_MACH_ARMADA_375 is not set
+# CONFIG_MACH_ARMADA_38X is not set
 
 CONFIG_MVEBU_DEVBUS=y
 CONFIG_PCI_MVEBU=y
@@ -52,6 +54,9 @@ CONFIG_PHY_MVEBU_SATA=y
 CONFIG_ARMADA_THERMAL=m
 CONFIG_DRM_ARMADA=m
 # CONFIG_SND_KIRKWOOD_SOC is not set
+# CONFIG_CACHE_FEROCEON_L2 is not set
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+# CONFIG_ORION_WATCHDOG is not set
 
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
@@ -416,6 +421,7 @@ CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
 
 CONFIG_MFD_SYSCON=y
+CONFIG_GPIO_SYSCON=m
 CONFIG_SENSORS_MC13783_ADC=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_MC13783=m
@@ -574,6 +580,8 @@ CONFIG_DRM_TEGRA_FBDEV=y
 CONFIG_DRM_TEGRA_STAGING=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_LD9040=m
+CONFIG_DRM_PANEL_S6E8AA0=m
 
 CONFIG_TEGRA_WATCHDOG=m
 
@@ -665,6 +673,8 @@ CONFIG_REGULATOR_MAX8973=m
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
 
+# CONFIG_MACH_DOVE is not set
+
 # CONFIG_SOC_VF610 is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_SND_SOC_ADI is not set
-- 
cgit