From dcb5f188a7d07499602de234a31c5671c33e7492 Mon Sep 17 00:00:00 2001
From: Josh Cartwright <josh.cartwright@ni.com>
Date: Thu, 24 Jan 2013 13:33:25 -0600
Subject: [PATCH] --- yaml --- r: 355462 b: refs/heads/master c:
 552a5774db69e45545d82e3ca4caae41e9283e00 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/configs/multi_v7_defconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f9d18e4bf22..a99480867a45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 686fad5c3a5409eababf4543f0ecfea3be73ac72
+refs/heads/master: 552a5774db69e45545d82e3ca4caae41e9283e00
diff --git a/trunk/arch/arm/configs/multi_v7_defconfig b/trunk/arch/arm/configs/multi_v7_defconfig
index 6862e7692191..e31d442343c8 100644
--- a/trunk/arch/arm/configs/multi_v7_defconfig
+++ b/trunk/arch/arm/configs/multi_v7_defconfig
@@ -8,6 +8,7 @@ CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_ARCH_SUNXI=y
 # CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set
+CONFIG_ARCH_ZYNQ=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_SMP=y
 CONFIG_ARM_ARCH_TIMER=y