1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index 88257c276eb9..3d264f288237 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -113,8 +113,8 @@ typedef struct drm_mga_private {
          * \sa drm_mga_private_t::mmio
          */
         /*@{ */
-        u32 mmio_base;             /**< Bus address of base of MMIO. */
-        u32 mmio_size;             /**< Size of the MMIO region. */
+        resource_size_t mmio_base;         /**< Bus address of base of MMIO. */
+        resource_size_t mmio_size;         /**< Size of the MMIO region. */
         /*@} */
 
         u32 clear_cmd;
@@ -317,8 +317,8 @@ do {									\
                 DRM_INFO( "\n" );                                       \
                 DRM_INFO( "   tail=0x%06x head=0x%06lx\n",              \
                           dev_priv->prim.tail,                          \
-                          MGA_READ( MGA_PRIMADDRESS ) -                 \
-                          dev_priv->primary->offset );                  \
+                          (unsigned long)(MGA_READ(MGA_PRIMADDRESS) -   \
+                                          dev_priv->primary->offset));  \
         }                                                               \
         if ( !test_bit( 0, &dev_priv->prim.wrapped ) ) {                \
                 if ( dev_priv->prim.space <                             \