diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-07 17:51:17 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-07 17:51:17 +0400 |
commit | 77445a14d6a3a1f920e3b031603541fc807f5f9b (patch) | |
tree | 17a6a75a83fc602345969b29fdf7199afe2df526 /arch/arm64/include/asm/hwcap.h | |
parent | 57841439b62e3ddb5ee50e765aa50330dde612d0 (diff) | |
parent | 702a4879ec337463f858c8ab467482cce260bf18 (diff) | |
download | linux-77445a14d6a3a1f920e3b031603541fc807f5f9b.tar.xz |
Merge remote-tracking branch 'spi/topic/bitbang' into HEAD
Diffstat (limited to 'arch/arm64/include/asm/hwcap.h')
-rw-r--r-- | arch/arm64/include/asm/hwcap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index 6d4482fa35bc..e2950b098e76 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -43,6 +43,6 @@ COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\ COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV) -extern unsigned int elf_hwcap; +extern unsigned long elf_hwcap; #endif #endif |