---

yaml --- r: 321804 b: refs/heads/master c: 3d9fb00 h: refs/heads/master v: v3
git-mirror · Aug 11, 2012 · ad393e1 · ad393e1
1 parent ac69e11
commit ad393e1
Show file tree

Hide file tree

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