diff --git a/src/vgatypes.h b/src/vgatypes.h
index 7484661..df002b8 100755
--- a/src/vgatypes.h
+++ b/src/vgatypes.h
@@ -131,7 +131,7 @@ typedef unsigned long XGIIOADDRESS;
 #endif
 
 #ifdef LINUX_XF86
-typedef IOADDRESS XGIIOADDRESS;
+typedef unsigned long XGIIOADDRESS;
 #endif
 
 #ifndef VBIOS_VER_MAX_LENGTH
diff --git a/src/xgi.h b/src/xgi.h
index e818631..53deadd 100755
--- a/src/xgi.h
+++ b/src/xgi.h
@@ -623,7 +623,7 @@ typedef struct {
     unsigned char *     FbBase;         /* VRAM virtual linear address */
     CARD32              IOAddress;      /* MMIO physical address */
     unsigned char *     IOBase;         /* MMIO linear address */
-    IOADDRESS           IODBase;        /* Base of PIO memory area */
+    unsigned long           IODBase;        /* Base of PIO memory area */
 #ifdef __alpha__
     unsigned char *     IOBaseDense;    /* MMIO for Alpha platform */
 #endif
diff --git a/src/xgi_driver.c b/src/xgi_driver.c
index b8b8679..3c12fd5 100755
--- a/src/xgi_driver.c
+++ b/src/xgi_driver.c
@@ -3038,7 +3038,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
 
     /* Get our relocated IO registers */
 #if defined(__arm__) 
-	pXGI->RelIO = (XGIIOADDRESS)(((IOADDRESS)VGAHWPTR(pScrn)->Base & 0xFFFFFFFC) + pXGI->IODBase); 	
+	pXGI->RelIO = (XGIIOADDRESS)(((unsigned long)VGAHWPTR(pScrn)->Base & 0xFFFFFFFC) + pXGI->IODBase); 	
 
 #else
     pXGI->RelIO = (XGIIOADDRESS) (pXGI->IODBase |