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/ppc64/kernel/vdso32/datapage.S | |
parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/ppc64/kernel/vdso32/datapage.S')
-rw-r--r-- | arch/ppc64/kernel/vdso32/datapage.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/vdso32/datapage.S b/arch/ppc64/kernel/vdso32/datapage.S index 29b6bd32e1f1..4f4eb0be3992 100644 --- a/arch/ppc64/kernel/vdso32/datapage.S +++ b/arch/ppc64/kernel/vdso32/datapage.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
17 | #include <asm/vdso.h> | 17 | #include <asm/vdso.h> |
18 | 18 | ||