diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 10:56:43 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 10:56:43 +0100 |
commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /include/asm-x86_64/vsyscall.h | |
parent | [MTD] bugfix: DataFlash is not bit writable (diff) | |
parent | Linux 2.6.19 (diff) | |
download | linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.tar.xz linux-bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-x86_64/vsyscall.h')
-rw-r--r-- | include/asm-x86_64/vsyscall.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-x86_64/vsyscall.h b/include/asm-x86_64/vsyscall.h index fd452fc2c037..01d1c17e2849 100644 --- a/include/asm-x86_64/vsyscall.h +++ b/include/asm-x86_64/vsyscall.h @@ -59,8 +59,6 @@ extern seqlock_t xtime_lock; extern int sysctl_vsyscall; -extern void vsyscall_set_cpu(int cpu); - #define ARCH_HAVE_XTIME_LOCK 1 #endif /* __KERNEL__ */ |