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 /arch/m68k/kernel | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
| download | op-kernel-dev-486a153f0e294f7cc735838edcb6b32e623cbe52.zip op-kernel-dev-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/m68k/kernel/head.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index e964015..23ca60a 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -42,7 +42,7 @@ #include <asm/traps.h> #include <asm/unistd.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> .globl system_call, buserr, trap .globl resume, ret_from_exception diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S index 7cd6de1..d4336d8 100644 --- a/arch/m68k/kernel/head.S +++ b/arch/m68k/kernel/head.S @@ -263,7 +263,7 @@ #include <asm/entry.h> #include <asm/pgtable.h> #include <asm/page.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #ifdef CONFIG_MAC |
