Fix some more cosmetic warnings.

4 files changed, 11 insertions, 13 deletions

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 4c4a0f61..b18b6d49 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -133,7 +133,7 @@ void RADEONWaitForFifoFunction(ScrnInfoPtr pScrn, int entries)
 		INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK;
 	    if (info->fifo_slots >= entries) return;
 	}
-	RADEONTRACE(("FIFO timed out: %ld entries, stat=0x%08lx\n",
+	RADEONTRACE(("FIFO timed out: %u entries, stat=0x%08x\n",
 		     INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
 		     INREG(RADEON_RBBM_STATUS)));
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -164,7 +164,7 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn)
 	    break;
     }
     if (i == RADEON_TIMEOUT) {
-	RADEONTRACE(("DC flush timeout: %lx\n",
+	RADEONTRACE(("DC flush timeout: %x\n",
 		    INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)));
     }
 }
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index bbf111e8..14260c9f 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -171,7 +171,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn)
 		return;
 	    }
 	}
-	RADEONTRACE(("Idle timed out: %ld entries, stat=0x%08lx\n",
+	RADEONTRACE(("Idle timed out: %u entries, stat=0x%08x\n",
 		     INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
 		     INREG(RADEON_RBBM_STATUS)));
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b6ce9982..54a868a4 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -93,6 +93,7 @@
 
 				/* X and server generic header files */
 #include "xf86.h"
+#include "xf86_ansic.h"		/* For xf86getsecs() */
 #include "xf86_OSproc.h"
 #include "xf86RAC.h"
 #include "xf86Resources.h"
@@ -4466,9 +4467,9 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn)
 
 static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
 {
+#if !defined(__powerpc__)
     RADEONInfoPtr  info = RADEONPTR(pScrn);
 
-#if !defined(__powerpc__)
     if (xf86LoadSubModule(pScrn, "int10")) {
 	xf86LoaderReqSymLists(int10Symbols, NULL);
 	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
@@ -6217,8 +6218,8 @@ static void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn,
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		    "Timeout trying to update memory controller settings !\n");
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-		    "MC_STATUS = 0x%08lx (on entry = 0x%08lx)\n",
-		    INREG(RADEON_MC_STATUS), old_mc_status);
+			   "MC_STATUS = 0x%08x (on entry = 0x%08x)\n",
+			   INREG(RADEON_MC_STATUS), (unsigned int)old_mc_status);
 		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 		    "You will probably crash now ... \n");
 		/* Nothing we can do except maybe try to kill the server,
@@ -7692,8 +7693,8 @@ static void RADEONInitDispBandwidth(ScrnInfoPtr pScrn)
     OUTREG(RADEON_GRPH_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
 				     (critical_point << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
 
-    RADEONTRACE(("GRPH_BUFFER_CNTL from %lx to %lx\n",
-	       info->SavedReg.grph_buffer_cntl, INREG(RADEON_GRPH_BUFFER_CNTL)));
+    RADEONTRACE(("GRPH_BUFFER_CNTL from %x to %x\n",
+		 (unsigned int)info->SavedReg.grph_buffer_cntl, INREG(RADEON_GRPH_BUFFER_CNTL)));
 
     if (mode2) {
 	stop_req = mode2->HDisplay * info2->CurrentLayout.pixel_bytes / 16;
@@ -7740,8 +7741,8 @@ static void RADEONInitDispBandwidth(ScrnInfoPtr pScrn)
 	OUTREG(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
 					  (critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
 
-	RADEONTRACE(("GRPH2_BUFFER_CNTL from %lx to %lx\n",
-		     info->SavedReg.grph2_buffer_cntl, INREG(RADEON_GRPH2_BUFFER_CNTL)));
+	RADEONTRACE(("GRPH2_BUFFER_CNTL from %x to %x\n",
+		     (unsigned int)info->SavedReg.grph2_buffer_cntl, INREG(RADEON_GRPH2_BUFFER_CNTL)));
     }
 }   
 
diff --git a/src/radeon_video.c b/src/radeon_video.c
index d567e19f..30f3befd 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2726,9 +2726,6 @@ RADEONPutImage(
    int top, left, npixels, nlines, bpp;
    BoxRec dstBox;
    CARD32 tmp;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
-   unsigned char *RADEONMMIO = info->MMIO;
-#endif
 
    /*
     * s2offset, s3offset - byte offsets into U and V plane of the