aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 15:16:14 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-16 15:16:14 -0700
commit4fbca5320eb102d2e15bdeffe79e125c11cf925e (patch)
tree59111c77d71bbdf557bbc30e31f5f3235ae0498c /include/asm-arm
parent509b70b677ca35a0e800807c6470181df5008d70 (diff)
parent3170a5e80be7db29ab5ccb6b4145cf28b4a156de (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] arch/arm/kernel/dma-isa.c: named initializers [ARM] 3527/1: MPCore Boot Lockup Fix [ARM] arch/arm/kernel/process.c: Fix warning [ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM [ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes [ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h
Diffstat (limited to 'include/asm-arm')
-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 a9c75b2c314..84252605522 100644
--- a/include/asm-arm/procinfo.h
+++ b/include/asm-arm/procinfo.h
@@ -45,8 +45,6 @@ extern unsigned int elf_hwcap;
#endif /* __ASSEMBLY__ */
-#define PROC_INFO_SZ 48
-
#define HWCAP_SWP 1
#define HWCAP_HALF 2
#define HWCAP_THUMB 4