


---

 25-akpm/drivers/char/hpet.c |   15 ---------------
 1 files changed, 15 deletions(-)

diff -puN drivers/char/hpet.c~hpet-driver-updates-move-readq drivers/char/hpet.c
--- 25/drivers/char/hpet.c~hpet-driver-updates-move-readq	Mon May 17 16:15:26 2004
+++ 25-akpm/drivers/char/hpet.c	Mon May 17 16:15:26 2004
@@ -90,21 +90,6 @@ static struct hpets *hpets;
 #define	read_counter(MC)	readl(MC)
 #endif
 
-#ifndef readq
-static unsigned long long __inline readq(void *addr)
-{
-	return readl(addr) | (((unsigned long long)readl(addr + 4)) << 32LL);
-}
-#endif
-
-#ifndef writeq
-static void __inline writeq(unsigned long long v, void *addr)
-{
-	writel(v & 0xffffffff, addr);
-	writel(v >> 32, addr + 4);
-}
-#endif
-
 static irqreturn_t hpet_interrupt(int irq, void *data, struct pt_regs *regs)
 {
 	struct hpet_dev *devp;

_
