diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/parisc/kernel/entry.S | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
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 @@ | |||
| 38 | #include <asm/thread_info.h> | 38 | #include <asm/thread_info.h> |
| 39 | 39 | ||
| 40 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 41 | #include <linux/init.h> | ||
| 42 | 41 | ||
| 43 | #ifdef CONFIG_64BIT | 42 | #ifdef CONFIG_64BIT |
| 44 | .level 2.0w | 43 | .level 2.0w |
| @@ -622,7 +621,7 @@ | |||
| 622 | * the static part of the kernel address space. | 621 | * the static part of the kernel address space. |
| 623 | */ | 622 | */ |
| 624 | 623 | ||
| 625 | __HEAD | 624 | .text |
| 626 | 625 | ||
| 627 | .align PAGE_SIZE | 626 | .align PAGE_SIZE |
| 628 | 627 | ||