diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-31 00:10:26 -0400 |
| commit | 8181d3ef26ed1d9eb21e2cdcac374e1f457fdc06 (patch) | |
| tree | 1a081f09ebcf2a84de899ddeadd0e4c5e48b50d2 /arch/x86/include/asm/vgtod.h | |
| parent | 54525552c6ccfd867e819845da14be994e303218 (diff) | |
| parent | 55922c9d1b84b89cb946c777fddccb3247e7df2c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'arch/x86/include/asm/vgtod.h')
| -rw-r--r-- | arch/x86/include/asm/vgtod.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h index 3d61e204826f..646b4c1ca695 100644 --- a/arch/x86/include/asm/vgtod.h +++ b/arch/x86/include/asm/vgtod.h | |||
| @@ -23,8 +23,6 @@ struct vsyscall_gtod_data { | |||
| 23 | struct timespec wall_to_monotonic; | 23 | struct timespec wall_to_monotonic; |
| 24 | struct timespec wall_time_coarse; | 24 | struct timespec wall_time_coarse; |
| 25 | }; | 25 | }; |
| 26 | extern struct vsyscall_gtod_data __vsyscall_gtod_data | ||
| 27 | __section_vsyscall_gtod_data; | ||
| 28 | extern struct vsyscall_gtod_data vsyscall_gtod_data; | 26 | extern struct vsyscall_gtod_data vsyscall_gtod_data; |
| 29 | 27 | ||
| 30 | #endif /* _ASM_X86_VGTOD_H */ | 28 | #endif /* _ASM_X86_VGTOD_H */ |