diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-15 20:19:52 -0400 |
| commit | 18594822fcb01d4b35e05b9018f770a0b4156d1a (patch) | |
| tree | 38d35c38086a564beaac215f8e52694cdbfab1c3 /arch/arm/kernel/head.S | |
| parent | 5b5ffbc1e6d62d89747f3f59c09b2e488a7d7fce (diff) | |
| parent | c4694c76ce28dd7e415b4f3014d8c6e580b5f3d2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'arch/arm/kernel/head.S')
| -rw-r--r-- | arch/arm/kernel/head.S | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 04b66a9328ef..04f7344e356a 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S | |||
| @@ -24,14 +24,6 @@ | |||
| 24 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 25 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 26 | 26 | ||
| 27 | #define PROCINFO_MMUFLAGS 8 | ||
| 28 | #define PROCINFO_INITFUNC 12 | ||
| 29 | |||
| 30 | #define MACHINFO_TYPE 0 | ||
| 31 | #define MACHINFO_PHYSIO 4 | ||
| 32 | #define MACHINFO_PGOFFIO 8 | ||
| 33 | #define MACHINFO_NAME 12 | ||
| 34 | |||
| 35 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) | 27 | #define KERNEL_RAM_ADDR (PAGE_OFFSET + TEXT_OFFSET) |
| 36 | 28 | ||
| 37 | /* | 29 | /* |