summaryrefslogtreecommitdiff
path: root/include/asm-x86/tsc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 14:41:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 14:41:20 -0700
commitb69d3987f4360a5e7e9e55465b3cdd0cc204b79e (patch)
tree8b2142b2ed4a4951b4d7fc13739b6207730e6b04 /include/asm-x86/tsc.h
parent57675e6e75c18f279b944dc2397cc9fd0053845e (diff)
parenta4928cffe6435caf427ae673131a633c1329dbf3 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes: "make namespacecheck" fixes x86: fix compilation error in VisWS x86: voyager fix x86: Drop duplicate from setup.c intel-iommu.c: dma ops fix
Diffstat (limited to 'include/asm-x86/tsc.h')
-rw-r--r--include/asm-x86/tsc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86/tsc.h b/include/asm-x86/tsc.h
index 0434bd8349a7..d2d8eb5b55f5 100644
--- a/include/asm-x86/tsc.h
+++ b/include/asm-x86/tsc.h
@@ -18,7 +18,6 @@ extern unsigned int cpu_khz;
extern unsigned int tsc_khz;
extern void disable_TSC(void);
-extern void enable_TSC(void);
static inline cycles_t get_cycles(void)
{