Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / include / asm-x86 / vsyscall.h

diff --git a/include/asm-x86/vsyscall.h b/include/asm-x86/vsyscall.h
index 3b8ceb4af2cf6045290d79570187bd5f2206556b..f01c49f5d108d50666535d0fb1e52cc1bdc97c2d 100644 (file)
--- a/include/asm-x86/vsyscall.h
+++ b/include/asm-x86/vsyscall.h
@@ -29,9 +29,6 @@ enum vsyscall_num {
 #define VGETCPU_RDTSCP 1
 #define VGETCPU_LSL    2
 
-#define hpet_readl(a)           readl((const void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
-#define hpet_writel(d,a)        writel(d, (void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
-
 extern int __vgetcpu_mode;
 extern volatile unsigned long __jiffies;