diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-10-18 12:28:24 -0400 |
| commit | ed8c3174dd227031d1f3b9fa4fbb512f8f623434 (patch) | |
| tree | bac4953f8899d6600f4716c0bcde1e25e34c2591 /include/asm-x86/vsyscall.h | |
| parent | 8aef7e8f8de2d900da892085edbf14ea35fe6881 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/Makefile
Diffstat (limited to 'include/asm-x86/vsyscall.h')
| -rw-r--r-- | include/asm-x86/vsyscall.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/vsyscall.h b/include/asm-x86/vsyscall.h index 6b66ff905af0..dcd4682413de 100644 --- a/include/asm-x86/vsyscall.h +++ b/include/asm-x86/vsyscall.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X86_64_VSYSCALL_H_ | 1 | #ifndef ASM_X86__VSYSCALL_H |
| 2 | #define _ASM_X86_64_VSYSCALL_H_ | 2 | #define ASM_X86__VSYSCALL_H |
| 3 | 3 | ||
| 4 | enum vsyscall_num { | 4 | enum vsyscall_num { |
| 5 | __NR_vgettimeofday, | 5 | __NR_vgettimeofday, |
| @@ -41,4 +41,4 @@ extern void map_vsyscall(void); | |||
| 41 | 41 | ||
| 42 | #endif /* __KERNEL__ */ | 42 | #endif /* __KERNEL__ */ |
| 43 | 43 | ||
| 44 | #endif /* _ASM_X86_64_VSYSCALL_H_ */ | 44 | #endif /* ASM_X86__VSYSCALL_H */ |