diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/sparc/mm/swift.S | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/sparc/mm/swift.S')
| -rw-r--r-- | arch/sparc/mm/swift.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S index 2dcaa5ac1a38..cd90f3fdc4e7 100644 --- a/arch/sparc/mm/swift.S +++ b/arch/sparc/mm/swift.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include <asm/asi.h> | 9 | #include <asm/asi.h> |
| 10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 11 | #include <asm/pgtsrmmu.h> | 11 | #include <asm/pgtsrmmu.h> |
| 12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
| 13 | 13 | ||
| 14 | .text | 14 | .text |
| 15 | .align 4 | 15 | .align 4 |