diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 00:46:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 00:46:49 +0200 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/parisc/kernel/syscall.S | |
| parent | Remove "must_check" attributes in PCI-land (diff) | |
| parent | kbuild: um fix so it compile with generic asm-offsets.h support (diff) | |
| download | linux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.xz linux-486a153f0e294f7cc735838edcb6b32e623cbe52.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/parisc/kernel/syscall.S')
| -rw-r--r-- | arch/parisc/kernel/syscall.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S index 32ea701f4d20..8c7a7185cd3b 100644 --- a/arch/parisc/kernel/syscall.S +++ b/arch/parisc/kernel/syscall.S @@ -7,7 +7,7 @@ * sorry about the wall, puffin.. */ -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #include <asm/unistd.h> #include <asm/errno.h> #include <asm/psw.h> |