diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
| commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
| tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /drivers/char/drm/via_dmablit.c | |
| parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/char/drm/via_dmablit.c')
| -rw-r--r-- | drivers/char/drm/via_dmablit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c index 832de1d9ba7e..3dd1ed3d1bf5 100644 --- a/drivers/char/drm/via_dmablit.c +++ b/drivers/char/drm/via_dmablit.c | |||
| @@ -560,7 +560,7 @@ via_init_dmablit(struct drm_device *dev) | |||
| 560 | blitq->head = 0; | 560 | blitq->head = 0; |
| 561 | blitq->cur = 0; | 561 | blitq->cur = 0; |
| 562 | blitq->serviced = 0; | 562 | blitq->serviced = 0; |
| 563 | blitq->num_free = VIA_NUM_BLIT_SLOTS; | 563 | blitq->num_free = VIA_NUM_BLIT_SLOTS - 1; |
| 564 | blitq->num_outstanding = 0; | 564 | blitq->num_outstanding = 0; |
| 565 | blitq->is_active = 0; | 565 | blitq->is_active = 0; |
| 566 | blitq->aborting = 0; | 566 | blitq->aborting = 0; |