X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fsparc%2Fkernel%2Fpmc.c;h=869c2f13bfad567516cc667f121f2b3f691ce73e;hb=a9fdee76789476a10f923f9fb3c84993042da3ac;hp=7eca8871ff47cf0914c902674e5ae697c22779cf;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index 7eca8871f..869c2f13b 100644
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -30,7 +30,7 @@
 #define PMC_IDLE_REG	0x00
 #define PMC_IDLE_ON		0x01
 
-volatile static u8 __iomem *regs; 
+volatile static u8 *regs; 
 static int pmc_regsize;
 
 #define pmc_readb(offs)			(sbus_readb(regs+offs))
@@ -55,7 +55,7 @@ void pmc_swift_idle(void)
 
 static inline void pmc_free(void)
 {
-	sbus_iounmap(regs, pmc_regsize);
+	sbus_iounmap((unsigned long)regs, pmc_regsize);
 }
 
 static int __init pmc_probe(void)
@@ -76,9 +76,9 @@ sbus_done:
 	}
 
 	pmc_regsize = sdev->reg_addrs[0].reg_size;
-	regs = sbus_ioremap(&sdev->resource[0], 0, 
+	regs = (u8*) sbus_ioremap(&sdev->resource[0], 0, 
 				   pmc_regsize, PMC_OBPNAME);
-	if (!regs) {
+	if(NULL == regs) {
 		printk(KERN_ERR "%s: unable to map registers\n", PMC_DEVNAME);
 		return -ENODEV;
 	}