From: Josh Cartwright <josh.cartwright@ni.com>
Date: Thu, 24 Jan 2013 19:33:25 +0000 (-0600)
Subject: ARM: multi_v7_defconfig: add ARCH_ZYNQ
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=552a5774db69e45545d82e3ca4caae41e9283e00;p=linux-beck.git

ARM: multi_v7_defconfig: add ARCH_ZYNQ

Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6862e7692191..e31d442343c8 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/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