diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 16:34:25 -0400 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /arch/parisc/kernel/pacache.S | |
| parent | c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 (diff) | |
| parent | 4ed47896935573c8423d05bddda3f269d6e6c613 (diff) | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'arch/parisc/kernel/pacache.S')
| -rw-r--r-- | arch/parisc/kernel/pacache.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index e3246a5ca74f..09b77b2553c6 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
| @@ -37,9 +37,8 @@ | |||
| 37 | #include <asm/pgtable.h> | 37 | #include <asm/pgtable.h> |
| 38 | #include <asm/cache.h> | 38 | #include <asm/cache.h> |
| 39 | #include <linux/linkage.h> | 39 | #include <linux/linkage.h> |
| 40 | #include <linux/init.h> | ||
| 41 | 40 | ||
| 42 | __HEAD | 41 | .text |
| 43 | .align 128 | 42 | .align 128 |
| 44 | 43 | ||
| 45 | ENTRY(flush_tlb_all_local) | 44 | ENTRY(flush_tlb_all_local) |