patch-2.4.20 linux-2.4.20/drivers/char/drm/r128_cce.c

Next file: linux-2.4.20/drivers/char/drm/r128_drv.c
Previous file: linux-2.4.20/drivers/char/drm/mga_warp.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/char/drm/r128_cce.c linux-2.4.20/drivers/char/drm/r128_cce.c
@@ -28,7 +28,6 @@
  *    Gareth Hughes <gareth@valinux.com>
  */
 
-#define __NO_VERSION__
 #include "r128.h"
 #include "drmP.h"
 #include "r128_drv.h"
@@ -352,8 +351,8 @@
 
 		R128_WRITE( R128_PM4_BUFFER_DL_RPTR_ADDR,
      			    entry->busaddr[page_ofs]);
-		DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
-			   entry->busaddr[page_ofs],
+		DRM_DEBUG( "ring rptr: offset=0x%08llx handle=0x%08lx\n",
+			   (u64)entry->busaddr[page_ofs],
      			   entry->handle + tmp_ofs );
 	}
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)