diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
| commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
| tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index e57df08d4ae..87f7e2cc52d 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -724,8 +724,8 @@ static struct radeon_asic evergreen_asic = { | |||
| 724 | .irq_set = &evergreen_irq_set, | 724 | .irq_set = &evergreen_irq_set, |
| 725 | .irq_process = &evergreen_irq_process, | 725 | .irq_process = &evergreen_irq_process, |
| 726 | .get_vblank_counter = &evergreen_get_vblank_counter, | 726 | .get_vblank_counter = &evergreen_get_vblank_counter, |
| 727 | .fence_ring_emit = NULL, | 727 | .fence_ring_emit = &r600_fence_ring_emit, |
| 728 | .cs_parse = NULL, | 728 | .cs_parse = &evergreen_cs_parse, |
| 729 | .copy_blit = NULL, | 729 | .copy_blit = NULL, |
| 730 | .copy_dma = NULL, | 730 | .copy_dma = NULL, |
| 731 | .copy = NULL, | 731 | .copy = NULL, |