Merge branch 'linux-2.6' into for-2.6.24

[linux-2.6] / include / asm-x86_64 / timex.h

diff --git a/include/asm-x86_64/timex.h b/include/asm-x86_64/timex.h
index f6527e1b6c1c68eff886a54bc9ff860b48e85b7e..6ed21f44d3084cc2ee2516b9f2b582ae9b543a5a 100644 (file)
--- a/include/asm-x86_64/timex.h
+++ b/include/asm-x86_64/timex.h
@@ -9,7 +9,6 @@
 #include <asm/8253pit.h>
 #include <asm/msr.h>
 #include <asm/vsyscall.h>
-#include <asm/hpet.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/tsc.h>