diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-24 13:55:29 -0400 |
| commit | ec329a135974f1c400214dab02f09584d4beeba9 (patch) | |
| tree | 235be754f76f4e7d51975d2434f226cfc75cdd08 /drivers/char/drm/mga_drv.h | |
| parent | bbf207860931b6a033d0fbcd170ae2332c0d8216 (diff) | |
| parent | 5d7edb3c1a01310725d86f0d83fb3be45685dc82 (diff) | |
Manual merge of for-linus to upstream (fix conflicts in drivers/infiniband/core/ucm.c)
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 b22fdbd4f830..6059c5a5b105 100644 --- a/drivers/char/drm/mga_drv.h +++ b/drivers/char/drm/mga_drv.h | |||
| @@ -227,7 +227,7 @@ static inline u32 _MGA_READ(u32 *addr) | |||
| 227 | #define MGA_EMIT_STATE( dev_priv, dirty ) \ | 227 | #define MGA_EMIT_STATE( dev_priv, dirty ) \ |
| 228 | do { \ | 228 | do { \ |
| 229 | if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) { \ | 229 | if ( (dirty) & ~MGA_UPLOAD_CLIPRECTS ) { \ |
| 230 | if ( dev_priv->chipset == MGA_CARD_TYPE_G400 ) { \ | 230 | if ( dev_priv->chipset >= MGA_CARD_TYPE_G400 ) { \ |
| 231 | mga_g400_emit_state( dev_priv ); \ | 231 | mga_g400_emit_state( dev_priv ); \ |
| 232 | } else { \ | 232 | } else { \ |
| 233 | mga_g200_emit_state( dev_priv ); \ | 233 | mga_g200_emit_state( dev_priv ); \ |