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/alpha/kernel | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/alpha/kernel/head.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index f0927ee53f29..76cc0cb5fc2e 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/config.h> | 7 | #include <linux/config.h> |
| 8 | #include <asm/asm_offsets.h> | 8 | #include <asm/asm-offsets.h> |
| 9 | #include <asm/thread_info.h> | 9 | #include <asm/thread_info.h> |
| 10 | #include <asm/pal.h> | 10 | #include <asm/pal.h> |
| 11 | #include <asm/errno.h> | 11 | #include <asm/errno.h> |
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S index 4ca2e404708a..0905721fcbca 100644 --- a/arch/alpha/kernel/head.S +++ b/arch/alpha/kernel/head.S | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/config.h> | 10 | #include <linux/config.h> |
| 11 | #include <asm/system.h> | 11 | #include <asm/system.h> |
| 12 | #include <asm/asm_offsets.h> | 12 | #include <asm/asm-offsets.h> |
| 13 | 13 | ||
| 14 | .globl swapper_pg_dir | 14 | .globl swapper_pg_dir |
| 15 | .globl _stext | 15 | .globl _stext |