[PATCH] x86_64: cleanup tsc.c merge artifact

[Thomas Gleixner]

tsc_unstable is declared twice.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>

---
 arch/x86_64/kernel/tsc.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux-2.6.23-rc1/arch/x86_64/kernel/tsc.c
===================================================================
--- linux-2.6.23-rc1.orig/arch/x86_64/kernel/tsc.c	2007-07-26 09:45:51.000000000 +0200
+++ linux-2.6.23-rc1/arch/x86_64/kernel/tsc.c	2007-07-26 09:45:53.000000000 +0200
@@ -118,8 +118,6 @@ core_initcall(cpufreq_tsc);
 
 #endif
 
-static int tsc_unstable = 0;
-
 /*
  * Make an educated guess if the TSC is trustworthy and synchronized
  * over all CPUs.


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/