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/x86_64/lib/getuser.S | |
parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/x86_64/lib/getuser.S')
-rw-r--r-- | arch/x86_64/lib/getuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/lib/getuser.S b/arch/x86_64/lib/getuser.S index f80bafee8669..3844d5e885a4 100644 --- a/arch/x86_64/lib/getuser.S +++ b/arch/x86_64/lib/getuser.S | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/linkage.h> | 29 | #include <linux/linkage.h> |
30 | #include <asm/page.h> | 30 | #include <asm/page.h> |
31 | #include <asm/errno.h> | 31 | #include <asm/errno.h> |
32 | #include <asm/offset.h> | 32 | #include <asm/asm-offsets.h> |
33 | #include <asm/thread_info.h> | 33 | #include <asm/thread_info.h> |
34 | 34 | ||
35 | .text | 35 | .text |