aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorAndrew Dodd <atd7@cornell.edu>2013-02-16 18:43:35 -0500
committerAndrew Dodd <atd7@cornell.edu>2013-02-27 09:19:13 -0500
commit19dd8724942d4998ccaa090daa2a69b33648d2bb (patch)
tree3ac48587c33355b9b1d08b70916249c5392a88ec /arch/arm/include
parentb08797f2afdfc604c3143f8725d058aeef8ddcb2 (diff)
downloadkernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.zip
kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.gz
kernel_samsung_smdk4412-19dd8724942d4998ccaa090daa2a69b33648d2bb.tar.bz2
Fix mistakes in merge
Change-Id: Ib92c3067dec28605e8905daddc44a667683bebc7
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/hwcap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hwcap.h b/arch/arm/include/asm/hwcap.h
index 2a0e8b8..39dfd7e 100644
--- a/arch/arm/include/asm/hwcap.h
+++ b/arch/arm/include/asm/hwcap.h
@@ -24,6 +24,7 @@
#define HWCAP_VFPv4 (1 << 16)
#define HWCAP_IDIVA (1 << 17)
#define HWCAP_IDIVT (1 << 18)
+#define HWCAP_VFPD32 (1 << 19) /* set if VFP has 32 regs (not 16) */
#define HWCAP_IDIV (HWCAP_IDIVA | HWCAP_IDIVT)