diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
| commit | e7a41d7f5be49241480a20eb733262712e0f8dcb (patch) | |
| tree | 801c7eadf769db981dfb8a900a24ef48542958a6 /linux-core/radeon_ms_drv.c | |
| parent | fb9ea12438de95a6ac085879e079055eaea3daf8 (diff) | |
| parent | bfdddd218ec3e7ce3f8e765b93af35661a7bf0fd (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_bo.c
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_irq.c
Diffstat (limited to 'linux-core/radeon_ms_drv.c')
| -rw-r--r-- | linux-core/radeon_ms_drv.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux-core/radeon_ms_drv.c b/linux-core/radeon_ms_drv.c index 4b52a7d7..d7b0eecc 100644 --- a/linux-core/radeon_ms_drv.c +++ b/linux-core/radeon_ms_drv.c @@ -57,8 +57,6 @@ static struct drm_driver driver = { .context_dtor = NULL, .kernel_context_switch = NULL, .kernel_context_switch_unlock = NULL, - .vblank_wait = NULL, - .vblank_wait2 = NULL, .dri_library_name = radeon_ms_driver_dri_library_name, .device_is_agp = NULL, .irq_handler = radeon_ms_irq_handler, @@ -83,8 +81,7 @@ static struct drm_driver driver = { .date = DRIVER_DATE, .driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | - DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | - DRIVER_IRQ_VBL | DRIVER_IRQ_VBL2, + DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED, .dev_priv_size = 0, .ioctls = radeon_ms_ioctls, .num_ioctls = 0, |