diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-14 15:03:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-14 15:03:17 +0200 |
| commit | a3368904bd230f9101d77de0a683b5d7d4525351 (patch) | |
| tree | aee7acc6876f23d33ab5d03309338e3fc9623293 /arch/parisc/kernel/entry.S | |
| parent | 86b12c3c91755f7021544d241ab919fc0dab2096 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'linus' into kmemcheck2
Diffstat (limited to 'arch/parisc/kernel/entry.S')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index 5d0837458c19..d1fa4edd2d80 100644 --- a/arch/parisc/kernel/entry.S +++ b/arch/parisc/kernel/entry.S @@ -38,7 +38,6 @@ #include <asm/thread_info.h> #include <linux/linkage.h> -#include <linux/init.h> #ifdef CONFIG_64BIT .level 2.0w @@ -622,7 +621,7 @@ * the static part of the kernel address space. */ - __HEAD + .text .align PAGE_SIZE |