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/m68k/kernel/entry.S | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m68k/kernel/entry.S')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index e964015a31dc..23ca60a45552 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <asm/traps.h> | 42 | #include <asm/traps.h> |
| 43 | #include <asm/unistd.h> | 43 | #include <asm/unistd.h> |
| 44 | 44 | ||
| 45 | #include <asm/offsets.h> | 45 | #include <asm/asm-offsets.h> |
| 46 | 46 | ||
| 47 | .globl system_call, buserr, trap | 47 | .globl system_call, buserr, trap |
| 48 | .globl resume, ret_from_exception | 48 | .globl resume, ret_from_exception |