1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index bcfa1514a4d0..bb4b2e1a78c1 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -868,7 +868,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
                  */
                 dev_priv->sarea_priv->ctx_owner = 0;
 
-                if ((dev_priv->flags & CHIP_HAS_HIERZ)
+                if ((dev_priv->flags & RADEON_HAS_HIERZ)
                     && (flags & RADEON_USE_HIERZ)) {
                         /* FIXME : reverse engineer that for Rx00 cards */
                         /* FIXME : the mask supposedly contains low-res z values. So can't set
@@ -913,7 +913,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
                 for (i = 0; i < nbox; i++) {
                         int tileoffset, nrtilesx, nrtilesy, j;
                         /* it looks like r200 needs rv-style clears, at least if hierz is not enabled? */
-                        if ((dev_priv->flags & CHIP_HAS_HIERZ)
+                        if ((dev_priv->flags & RADEON_HAS_HIERZ)
                             && !(dev_priv->microcode_version == UCODE_R200)) {
                                 /* FIXME : figure this out for r200 (when hierz is enabled). Or
                                    maybe r200 actually doesn't need to put the low-res z value into
@@ -997,7 +997,7 @@ static void radeon_cp_dispatch_clear(drm_device_t * dev,
                 }
 
                 /* TODO don't always clear all hi-level z tiles */
-                if ((dev_priv->flags & CHIP_HAS_HIERZ)
+                if ((dev_priv->flags & RADEON_HAS_HIERZ)
                     && (dev_priv->microcode_version == UCODE_R200)
                     && (flags & RADEON_USE_HIERZ))
                         /* r100 and cards without hierarchical z-buffer have no high-level z-buffer */
@@ -2992,9 +2992,9 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS)
                 value = RADEON_SCRATCH_REG_OFFSET;
                 break;
         case RADEON_PARAM_CARD_TYPE:
-                if (dev_priv->flags & CHIP_IS_PCIE)
+                if (dev_priv->flags & RADEON_IS_PCIE)
                         value = RADEON_CARD_PCIE;
-                else if (dev_priv->flags & CHIP_IS_AGP)
+                else if (dev_priv->flags & RADEON_IS_AGP)
                         value = RADEON_CARD_AGP;
                 else
                         value = RADEON_CARD_PCI;