From ad393e1587efa753a55b5c56a098093c930cdc12 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 3 Aug 2012 17:24:14 +0100
Subject: [PATCH] --- yaml --- r: 321804 b: refs/heads/master c:
 3d9fb0038a9b02febb01efc79a4a5d97f1822a90 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/vfp/vfpmodule.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4a5f8130adcb..4104128226f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e416eb923d0f9ff1e5e9b5c0e8b75ddd7db865
+refs/heads/master: 3d9fb0038a9b02febb01efc79a4a5d97f1822a90
diff --git a/trunk/arch/arm/vfp/vfpmodule.c b/trunk/arch/arm/vfp/vfpmodule.c
index fb849d044bde..c834b32af275 100644
--- a/trunk/arch/arm/vfp/vfpmodule.c
+++ b/trunk/arch/arm/vfp/vfpmodule.c
@@ -719,8 +719,10 @@ static int __init vfp_init(void)
 			if ((fmrx(MVFR1) & 0x000fff00) == 0x00011100)
 				elf_hwcap |= HWCAP_NEON;
 #endif
+#ifdef CONFIG_VFPv3
 			if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000)
 				elf_hwcap |= HWCAP_VFPv4;
+#endif
 		}
 	}
 	return 0;