aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/procinfo.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-05-19 01:02:42 -0400
committerPaul Mackerras <paulus@samba.org>2006-05-19 01:02:42 -0400
commit3c06da5ae5358e9d325d541a053e1059e9654bcc (patch)
tree04c953cc82fe57cff248ac523095cd4f0d9611a7 /include/asm-arm/procinfo.h
parent4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff)
parenta54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff)
Merge ../linux-2.6
Diffstat (limited to 'include/asm-arm/procinfo.h')
-rw-r--r--include/asm-arm/procinfo.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/procinfo.h b/include/asm-arm/procinfo.h
index a9c75b2c314f..842526055225 100644
--- a/include/asm-arm/procinfo.h
+++ b/include/asm-arm/procinfo.h
@@ -45,8 +45,6 @@ extern unsigned int elf_hwcap;
45 45
46#endif /* __ASSEMBLY__ */ 46#endif /* __ASSEMBLY__ */
47 47
48#define PROC_INFO_SZ 48
49
50#define HWCAP_SWP 1 48#define HWCAP_SWP 1
51#define HWCAP_HALF 2 49#define HWCAP_HALF 2
52#define HWCAP_THUMB 4 50#define HWCAP_THUMB 4