---

yaml --- r: 355462 b: refs/heads/master c: 552a577 h: refs/heads/master v: v3
git-mirror · Jan 28, 2013 · dcb5f18 · dcb5f18
1 parent 6dde29b
commit dcb5f18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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