Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / char / rio / rio.h

diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h
index b4c9187..1bf3622 100644 (file)
--- a/drivers/char/rio/rio.h
+++ b/drivers/char/rio/rio.h
@@ -129,8 +129,8 @@
 **     RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and
 **     returns the offset into the DP RAM area.
 */
-#define        RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&(O)))
-#define        RIO_OFF(C,O) ((long)(O)-(long)(C))
+#define        RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&(O)))
+#define        RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C))
 
 /*
 **     How to convert from various different device number formats: