diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:46:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 15:46:49 -0700 |
commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /include/asm-parisc | |
parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include/asm-parisc')
-rw-r--r-- | include/asm-parisc/assembly.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/assembly.h b/include/asm-parisc/assembly.h index cbc286f49b3..30b023411fe 100644 --- a/include/asm-parisc/assembly.h +++ b/include/asm-parisc/assembly.h @@ -63,7 +63,7 @@ .level 2.0w #endif -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #include <asm/page.h> #include <asm/asmregs.h> |