diff options
| author | Andy Voltz <andy.voltz@timesys.com> | 2010-11-15 16:00:38 -0500 |
|---|---|---|
| committer | Andy Voltz <andy.voltz@timesys.com> | 2010-11-17 11:30:34 -0500 |
| commit | 2e0ae4bf137e282e825b27b02eb46f86c59d004e (patch) | |
| tree | 7c2534acd757ca414f02c5b983ee67eb2b2493c6 /include/drm/drmP.h | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Bump Linux kernel to 2.6.32.25
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index c8e64bbadbcf..7ad3faa5dde7 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1295,6 +1295,7 @@ extern u32 drm_vblank_count(struct drm_device *dev, int crtc); extern void drm_handle_vblank(struct drm_device *dev, int crtc); extern int drm_vblank_get(struct drm_device *dev, int crtc); extern void drm_vblank_put(struct drm_device *dev, int crtc); +extern void drm_vblank_off(struct drm_device *dev, int crtc); extern void drm_vblank_cleanup(struct drm_device *dev); /* Modesetting support */ extern void drm_vblank_pre_modeset(struct drm_device *dev, int crtc); @@ -1401,7 +1402,7 @@ extern int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info * gart_info); extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size, - size_t align, dma_addr_t maxaddr); + size_t align); extern void __drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); extern void drm_pci_free(struct drm_device *dev, drm_dma_handle_t * dmah); |