diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:20:28 +0200 |
| commit | faeca31d068090285b77c39574d2bda14b079c50 (patch) | |
| tree | 789841a7f0d336b24a74f2191542a2eb8177c8fa /arch/parisc/hpux/wrappers.S | |
| parent | 499f8f84b8324ba27d756e03f373fa16eeed9ccc (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/pattip-x86-pat-2008-06-16_09.20_Mon
Diffstat (limited to 'arch/parisc/hpux/wrappers.S')
| -rw-r--r-- | arch/parisc/hpux/wrappers.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index ccd3a50c0995..58c53c879c02 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S @@ -28,10 +28,9 @@ #include <asm/assembly.h> #include <asm/signal.h> #include <linux/linkage.h> -#include <linux/init.h> .level LEVEL - __HEAD + .text /* These should probably go in a header file somewhere. * They are duplicated in kernel/wrappers.S |