diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 18:09:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 18:09:43 +0200 |
| commit | 713c0515a555952d53956196d47dec3a3ece860a (patch) | |
| tree | 52ef61f6dbb338ad64e24662da859265d0c87a4d /arch/parisc/hpux/wrappers.S | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
| parent | arch/parisc/kernel/perf_asm.S: build fix (diff) | |
| download | linux-713c0515a555952d53956196d47dec3a3ece860a.tar.xz linux-713c0515a555952d53956196d47dec3a3ece860a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
arch/parisc/kernel/perf_asm.S: build fix
parisc: remove -traditional from assembler flags
parisc: use conditional macro for 64-bit wide ops
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
arch/parisc/kernel/unaligned.c: use time_* macros
parisc: remove redundant display of free swap space in show_mem()
drivers/parisc: replace remaining __FUNCTION__ occurrences
parisc: replace remaining __FUNCTION__ occurrences
parisc: new termios definitions
parisc: fix trivial section name warnings
Diffstat (limited to 'arch/parisc/hpux/wrappers.S')
| -rw-r--r-- | arch/parisc/hpux/wrappers.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S index 58c53c879c02..ccd3a50c0995 100644 --- a/arch/parisc/hpux/wrappers.S +++ b/arch/parisc/hpux/wrappers.S @@ -28,9 +28,10 @@ #include <asm/assembly.h> #include <asm/signal.h> #include <linux/linkage.h> +#include <linux/init.h> .level LEVEL - .text + __HEAD /* These should probably go in a header file somewhere. * They are duplicated in kernel/wrappers.S |