diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:18 -0400 |
| commit | 33ee375b2ea5dd11581a57d67bedd0ca39b19a5e (patch) | |
| tree | 411d3a04936e281e54680ad082f98d985561bce5 /arch/parisc/hpux/gate.S | |
| parent | 6703f6d10dcd3316e03641a5ecaa6c8a04374d98 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'arch/parisc/hpux/gate.S')
| -rw-r--r-- | arch/parisc/hpux/gate.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S index f0b18ce89842..38a1c1b8d4e8 100644 --- a/arch/parisc/hpux/gate.S +++ b/arch/parisc/hpux/gate.S | |||
| @@ -13,10 +13,9 @@ | |||
| 13 | #include <asm/unistd.h> | 13 | #include <asm/unistd.h> |
| 14 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
| 15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
| 16 | #include <linux/init.h> | ||
| 17 | 16 | ||
| 18 | .level LEVEL | 17 | .level LEVEL |
| 19 | __HEAD | 18 | .text |
| 20 | 19 | ||
| 21 | .import hpux_call_table | 20 | .import hpux_call_table |
| 22 | .import hpux_syscall_exit,code | 21 | .import hpux_syscall_exit,code |