diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-22 01:24:35 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-22 01:24:35 -0400 |
| commit | 23bfc1a339e98510f2ce25a2764a0cfe195faa9e (patch) | |
| tree | 51652ad15f85d9d1367ae6f9b8641dfe46b4c501 /drivers/char/drm/mga_drv.h | |
| parent | 312f5726055534be1dc9dd369be13aabd2943fcb (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
merge linus head to drm-mm branch
Diffstat (limited to 'drivers/char/drm/mga_drv.h')
| -rw-r--r-- | drivers/char/drm/mga_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h index 474853deecfa..461728e6a58a 100644 --- a/drivers/char/drm/mga_drv.h +++ b/drivers/char/drm/mga_drv.h | |||
| @@ -228,7 +228,7 @@ static inline u32 _MGA_READ(u32 * addr) | |||
| 228 | #define MGA_EMIT_STATE( dev_priv, dirty ) \ | 228 | #define MGA_EMIT_STATE( dev_priv, dirty ) \ |
| 229 | do { \ | 229 | do { \ |
| 230 | if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) { \ | 230 | if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) { \ |
| 231 | if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) { \ | 231 | if ( dev_priv->chipset >= MGA_CARD_TYPE_G400 ) { \ |
| 232 | mga_g400_emit_state( dev_priv ); \ | 232 | mga_g400_emit_state( dev_priv ); \ |
| 233 | } else { \ | 233 | } else { \ |
| 234 | mga_g200_emit_state( dev_priv ); \ | 234 | mga_g200_emit_state( dev_priv ); \ |