diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/sparc/mm/viking.S | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/sparc/mm/viking.S')
| -rw-r--r-- | arch/sparc/mm/viking.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index f58712d26bf5..3cbd6de18dde 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <linux/config.h> | 9 | #include <linux/config.h> |
| 10 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
| 11 | #include <asm/psr.h> | 11 | #include <asm/psr.h> |
| 12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
| 13 | #include <asm/asi.h> | 13 | #include <asm/asi.h> |
| 14 | #include <asm/mxcc.h> | 14 | #include <asm/mxcc.h> |
| 15 | #include <asm/page.h> | 15 | #include <asm/page.h> |