diff options
author | David Dawes <dawes@xfree86.org> | 2001-04-09 16:27:54 +0000 |
---|---|---|
committer | David Dawes <dawes@xfree86.org> | 2001-04-09 16:27:54 +0000 |
commit | 1759c16ab9b64598968a0058039e8a66bf5f9773 (patch) | |
tree | a82d44dc47302041daf1f5f408c6f47017baac47 /linux/drm_drv.h | |
parent | 0e7f6c0726e5ff08eeab8e17a5aa63fbe44b3410 (diff) |
Import -f XFree86 4.0.99.2X_4_0_99_2
Diffstat (limited to 'linux/drm_drv.h')
-rw-r--r-- | linux/drm_drv.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 5337646f..7447ca6d 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -81,9 +81,6 @@ #ifndef __HAVE_COUNTERS #define __HAVE_COUNTERS 0 #endif -#ifndef __HAVE_SG -#define __HAVE_SG 0 -#endif #ifndef DRIVER_PREINIT #define DRIVER_PREINIT() @@ -181,11 +178,6 @@ static drm_ioctl_desc_t DRM(ioctls)[] = { [DRM_IOCTL_NR(DRM_IOCTL_AGP_UNBIND)] = { DRM(agp_unbind), 1, 1 }, #endif -#if __HAVE_SG - [DRM_IOCTL_NR(DRM_IOCTL_SG_ALLOC)] = { DRM(sg_alloc), 1, 1 }, - [DRM_IOCTL_NR(DRM_IOCTL_SG_FREE)] = { DRM(sg_free), 1, 1 }, -#endif - DRIVER_IOCTLS }; @@ -423,17 +415,6 @@ static int DRM(takedown)( drm_device_t *dev ) * handled in the AGP/GART driver. */ break; - case _DRM_SCATTER_GATHER: - /* Handle it, but do nothing, if HAVE_SG - * isn't defined. - */ -#if __HAVE_SG - if(dev->sg) { - DRM(sg_cleanup)(dev->sg); - dev->sg = NULL; - } -#endif - break; } DRM(free)(map, sizeof(*map), DRM_MEM_MAPS); } |