From 3b12ac4eeaf7771cdb97df1b43746559a5afb144 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clemens@ladisch.de>
Date: Sun, 30 Oct 2005 15:03:39 -0800
Subject: [PATCH] --- yaml --- r: 11910 b: refs/heads/master c:
 3d5640d1c7584689227256beeb63354c9a5baf2d h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/hpet.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9040ffe58778..a363719721b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7522e4ecdfdf86b9816f06d55766a6f88baa0348
+refs/heads/master: 3d5640d1c7584689227256beeb63354c9a5baf2d
diff --git a/trunk/drivers/char/hpet.c b/trunk/drivers/char/hpet.c
index 73e6614cdf84..cdf2ec842e2c 100644
--- a/trunk/drivers/char/hpet.c
+++ b/trunk/drivers/char/hpet.c
@@ -430,7 +430,7 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
 	}
 
 	if (devp->hd_flags & HPET_SHARED_IRQ) {
-		isr = 1 << (devp - hpets->hp_dev);
+		isr = 1 << (devp - devp->hd_hpets->hp_dev);
 		writel(isr, &hpet->hpet_isr);
 	}
 	writeq(g, &timer->hpet_config);
@@ -769,7 +769,7 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
 	if (!timer)
 		return 0;
 
-	hpet = hpets->hp_hpet;
+	hpet = hpetp->hp_hpet;
 	t = read_counter(&timer->hpet_compare);
 
 	i = 0;