diff options
author | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-07-30 01:55:32 -0400 |
commit | adbedd34244e2b054557002817f979a9b004a405 (patch) | |
tree | 78e4a524e84f8b3e23ae8b49ac689048584e4668 /arch/x86_64/lib/delay.c | |
parent | d6ac1a7910d22626bc77e73db091e00b810715f4 (diff) | |
parent | b0825488a642cadcf39709961dde61440cb0731c (diff) |
merge 2.6.13-rc4 with ACPI's to-linus tree
Diffstat (limited to 'arch/x86_64/lib/delay.c')
-rw-r--r-- | arch/x86_64/lib/delay.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86_64/lib/delay.c b/arch/x86_64/lib/delay.c index 33a873a3c223..841bd738a189 100644 --- a/arch/x86_64/lib/delay.c +++ b/arch/x86_64/lib/delay.c | |||
@@ -18,8 +18,6 @@ | |||
18 | #include <asm/smp.h> | 18 | #include <asm/smp.h> |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | int x86_udelay_tsc = 0; /* Delay via TSC */ | ||
22 | |||
23 | int read_current_timer(unsigned long *timer_value) | 21 | int read_current_timer(unsigned long *timer_value) |
24 | { | 22 | { |
25 | rdtscll(*timer_value); | 23 | rdtscll(*timer_value); |