From 7157f43fd911027ba18a69dbc8a6401cfb0b57ed Mon Sep 17 00:00:00 2001
From: John Williams <john.williams@petalogix.com>
Date: Tue, 22 Sep 2009 09:13:04 +1000
Subject: [PATCH] --- yaml --- r: 165947 b: refs/heads/master c:
 f97b4f7de4a4d92e578845d517660942e851ca4f h: refs/heads/master i:   165945:
 5c82e0d8d78e4375bcff87cfa84fb86b0b1f3d31   165943:
 d7b82a8877d9bc9302566c1d29c484289aecce10 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/microblaze/kernel/cpu/cpuinfo.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8dea434fb516..19025de123ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23902d95c9297fc1e214a705e57d46d69195b6b3
+refs/heads/master: f97b4f7de4a4d92e578845d517660942e851ca4f
diff --git a/trunk/arch/microblaze/kernel/cpu/cpuinfo.c b/trunk/arch/microblaze/kernel/cpu/cpuinfo.c
index c411c6757deb..3539babc1c18 100644
--- a/trunk/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/trunk/arch/microblaze/kernel/cpu/cpuinfo.c
@@ -28,6 +28,7 @@ const struct cpu_ver_key cpu_ver_lookup[] = {
 	{"7.10.d", 0x0b},
 	{"7.20.a", 0x0c},
 	{"7.20.b", 0x0d},
+	{"7.20.c", 0x0e},
 	/* FIXME There is no keycode defined in MBV for these versions */
 	{"2.10.a", 0x10},
 	{"3.00.a", 0x20},
@@ -49,6 +50,8 @@ const struct family_string_key family_string_lookup[] = {
 	{"spartan3a", 0xa},
 	{"spartan3an", 0xb},
 	{"spartan3adsp", 0xc},
+	{"spartan6", 0xd},
+	{"virtex6", 0xe},
 	/* FIXME There is no key code defined for spartan2 */
 	{"spartan2", 0xf0},
 	{NULL, 0},