summaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-03-03 05:09:08 +0100
committerGreg Kroah-Hartman2014-03-03 05:09:08 +0100
commit13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch)
treebc2c78c3b816a65f90c31cccebdc15b38352c045 /arch/x86/include
parentkernfs: remove duplicate dir.c at the top dir (diff)
parentLinux 3.14-rc5 (diff)
downloadkernel-qcow2-linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.tar.gz
kernel-qcow2-linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.tar.xz
kernel-qcow2-linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.zip
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/tsc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index 57ae63cd6ee2..94605c0e9cee 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -66,6 +66,6 @@ extern void tsc_save_sched_clock_state(void);
extern void tsc_restore_sched_clock_state(void);
/* MSR based TSC calibration for Intel Atom SoC platforms */
-int try_msr_calibrate_tsc(unsigned long *fast_calibrate);
+unsigned long try_msr_calibrate_tsc(void);
#endif /* _ASM_X86_TSC_H */