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/x86_64/kernel | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/x86_64/kernel')
| -rw-r--r-- | arch/x86_64/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/suspend_asm.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S index be51dbe1f75..3620508c8bd 100644 --- a/arch/x86_64/kernel/entry.S +++ b/arch/x86_64/kernel/entry.S @@ -36,7 +36,7 @@ #include <asm/errno.h> #include <asm/dwarf2.h> #include <asm/calling.h> -#include <asm/offset.h> +#include <asm/asm-offsets.h> #include <asm/msr.h> #include <asm/unistd.h> #include <asm/thread_info.h> diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm.S index 53f8e165951..4d659e97df1 100644 --- a/arch/x86_64/kernel/suspend_asm.S +++ b/arch/x86_64/kernel/suspend_asm.S @@ -14,7 +14,7 @@ #include <linux/linkage.h> #include <asm/segment.h> #include <asm/page.h> -#include <asm/offset.h> +#include <asm/asm-offsets.h> ENTRY(swsusp_arch_suspend) |