diff options
| author | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-01-22 09:42:37 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@hobbes.virtuousgeek.org> | 2008-01-22 09:42:37 -0800 |
| commit | 0cd4cbc9a6330bd619608f274592082de7c05bcf (patch) | |
| tree | 4e0b682a24e448d17abf8b2fadc75ccee2cd5b57 /linux-core/nouveau_drv.c | |
| parent | 128a8f7ea20af2549e448157b431d5c1f90f37c3 (diff) | |
| parent | 5231a524f53babd127a576d7567671dafb29651b (diff) | |
Merge branch 'master' into vblank-rework, including mach64 support
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/mga_irq.c
shared-core/radeon_irq.c
shared-core/via_irq.c
Mostly trivial conflicts.
mach64 support from Mathieu Bérard.
Diffstat (limited to 'linux-core/nouveau_drv.c')
| -rw-r--r-- | linux-core/nouveau_drv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index 01de67de..e9623eb1 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -81,6 +81,9 @@ static struct drm_driver driver = { .remove = __devexit_p(drm_cleanup_pci), }, + .bo_driver = &nouveau_bo_driver, + .fence_driver = &nouveau_fence_driver, + .name = DRIVER_NAME, .desc = DRIVER_DESC, .date = DRIVER_DATE, |