git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
vdso
/
vclock_gettime.c
diff --git
a/arch/x86/vdso/vclock_gettime.c
b/arch/x86/vdso/vclock_gettime.c
index 5b54cdfb2b07f989c34696ba1ca95c8dcd9f518d..23476c2ebfc4b38b817e5907e0c658e7d21a6715 100644
(file)
--- a/
arch/x86/vdso/vclock_gettime.c
+++ b/
arch/x86/vdso/vclock_gettime.c
@@
-19,7
+19,6
@@
#include <asm/hpet.h>
#include <asm/unistd.h>
#include <asm/io.h>
-#include <asm/vgtod.h>
#include "vextern.h"
#define gtod vdso_vsyscall_gtod_data