From: Al Viro <viro@zeniv.linux.org.uk>
Date: Wed, 1 Feb 2006 12:30:33 +0000 (-0500)
Subject: [PATCH] amd64 time.c __iomem annotations
X-Git-Tag: v2.6.16-rc3~73
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dd42b1518666132c21e7348c4b599c501f0021a1;p=linux-2.6-omap-h63xx.git

[PATCH] amd64 time.c __iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index c0844bffbf8..dba7237be5c 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -748,7 +748,7 @@ static __init int late_hpet_init(void)
 	 * Timer0 and Timer1 is used by platform.
 	 */
 	hd.hd_phys_address = vxtime.hpet_address;
-	hd.hd_address = (void *)fix_to_virt(FIX_HPET_BASE);
+	hd.hd_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE);
 	hd.hd_nirqs = ntimer;
 	hd.hd_flags = HPET_DATA_PLATFORM;
 	hpet_reserve_timer(&hd, 0);