From 71e05ed43f268dc7c4ce5575bc63a643f2564402 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 9 Feb 2007 16:39:15 +0000
Subject: [PATCH] --- yaml --- r: 47263 b: refs/heads/master c:
 5b71bddb78df5e292ae90f7603a996e51b3ecb88 h: refs/heads/master i:   47261:
 e51440e18ba23c819645b93cf3b5bafbbad2034f   47259:
 0934909381821f09019905799560e760b0fbf6ab   47255:
 f68659dd237b6555ab190bbadd24619bad62435c   47247:
 d8b08673b37103566f4d0c4e7578d6a55dd84a07   47231:
 eea2e1744b333332329874dfed6a55934ad339d2 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/i386/kernel/hpet.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d80ac66f1998..6b8c0f3355ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3cf83b70c25c2b1d5569d6cc24e879464d1803b
+refs/heads/master: 5b71bddb78df5e292ae90f7603a996e51b3ecb88
diff --git a/trunk/arch/i386/kernel/hpet.c b/trunk/arch/i386/kernel/hpet.c
index 45a8685bb60b..0b29d41322a2 100644
--- a/trunk/arch/i386/kernel/hpet.c
+++ b/trunk/arch/i386/kernel/hpet.c
@@ -12,7 +12,7 @@
 /* FSEC = 10^-15 NSEC = 10^-9 */
 #define FSEC_PER_NSEC	1000000
 
-static void *hpet_ptr;
+static void __iomem *hpet_ptr;
 
 static cycle_t read_hpet(void)
 {
@@ -40,8 +40,7 @@ static int __init init_hpet_clocksource(void)
 		return -ENODEV;
 
 	/* calculate the hpet address: */
-	hpet_base =
-		(void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+	hpet_base = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
 	hpet_ptr = hpet_base + HPET_COUNTER;
 
 	/* calculate the frequency: */