diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-03-30 01:54:54 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-03-30 01:54:54 -0400 |
| commit | c3c2ae466cfa1d4e079f6f0396e8f0f68ecb84b8 (patch) | |
| tree | a1417fd4328176658d4baf1e54510de7e2bc06f8 /linux-core/drm_drv.c | |
| parent | 48b5f095340e3d1b747fbececbab07e992ab344f (diff) | |
| parent | e2d7dfb61ad7a97367f050150160c205614d152e (diff) | |
Merge branch 'master' into r6xx-r7xx-support
Diffstat (limited to 'linux-core/drm_drv.c')
| -rw-r--r-- | linux-core/drm_drv.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 31a98fe8..c68e237c 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -397,6 +397,8 @@ static void drm_cleanup(struct drm_device * dev) return; } + drm_vblank_cleanup(dev); + drm_lastclose(dev); drm_fence_manager_takedown(dev); @@ -455,9 +457,6 @@ void drm_exit(struct drm_driver *driver) idr_for_each(&drm_minors_idr, &drm_minors_cleanup, driver); } else pci_unregister_driver(&driver->pci_driver); -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)) - free_nopage_retry(); -#endif DRM_INFO("Module unloaded\n"); } EXPORT_SYMBOL(drm_exit); |