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 /include/asm-ia64 | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/ptrace.h | 2 | ||||
| -rw-r--r-- | include/asm-ia64/thread_info.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h index 0bef19538406..c8766def9ee6 100644 --- a/include/asm-ia64/ptrace.h +++ b/include/asm-ia64/ptrace.h | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | #include <linux/config.h> | 57 | #include <linux/config.h> |
| 58 | 58 | ||
| 59 | #include <asm/fpu.h> | 59 | #include <asm/fpu.h> |
| 60 | #include <asm/offsets.h> | 60 | #include <asm/asm-offsets.h> |
| 61 | 61 | ||
| 62 | /* | 62 | /* |
| 63 | * Base-2 logarithm of number of pages to allocate per task structure | 63 | * Base-2 logarithm of number of pages to allocate per task structure |
diff --git a/include/asm-ia64/thread_info.h b/include/asm-ia64/thread_info.h index 7dc8951708a3..b2c79f0694f8 100644 --- a/include/asm-ia64/thread_info.h +++ b/include/asm-ia64/thread_info.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #ifndef _ASM_IA64_THREAD_INFO_H | 5 | #ifndef _ASM_IA64_THREAD_INFO_H |
| 6 | #define _ASM_IA64_THREAD_INFO_H | 6 | #define _ASM_IA64_THREAD_INFO_H |
| 7 | 7 | ||
| 8 | #include <asm/offsets.h> | 8 | #include <asm/asm-offsets.h> |
| 9 | #include <asm/processor.h> | 9 | #include <asm/processor.h> |
| 10 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
| 11 | 11 | ||