diff options
| author | Rik Faith <faith@alephnull.com> | 2000-07-21 16:57:00 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2000-07-21 16:57:00 +0000 |
| commit | 6dd96a15ed329f26565bb971877f03e15801f3f5 (patch) | |
| tree | ce5281124fcdfa73c27d775428c5e7432ec50e2b /linux-core/tdfx_drv.c | |
| parent | e38b34e54a79919588f23294ddb326309c9cb005 (diff) | |
Revert some changes and try alternative way to clean up AGP handling.
Diffstat (limited to 'linux-core/tdfx_drv.c')
| -rw-r--r-- | linux-core/tdfx_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c index 47039cd6..97bd4180 100644 --- a/linux-core/tdfx_drv.c +++ b/linux-core/tdfx_drv.c @@ -94,7 +94,7 @@ static drm_ioctl_desc_t tdfx_ioctls[] = { [DRM_IOCTL_NR(DRM_IOCTL_LOCK)] = { tdfx_lock, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)] = { tdfx_unlock, 1, 0 }, [DRM_IOCTL_NR(DRM_IOCTL_FINISH)] = { drm_finish, 1, 0 }, -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP [DRM_IOCTL_NR(DRM_IOCTL_AGP_ACQUIRE)] = {drm_agp_acquire, 1, 1}, [DRM_IOCTL_NR(DRM_IOCTL_AGP_RELEASE)] = {drm_agp_release, 1, 1}, [DRM_IOCTL_NR(DRM_IOCTL_AGP_ENABLE)] = {drm_agp_enable, 1, 1}, @@ -230,7 +230,7 @@ static int tdfx_takedown(drm_device_t *dev) } dev->magiclist[i].head = dev->magiclist[i].tail = NULL; } -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP /* Clear AGP information */ if (dev->agp) { drm_agp_mem_t *temp; @@ -330,7 +330,7 @@ int tdfx_init(void) drm_mem_init(); drm_proc_init(dev); -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP dev->agp = drm_agp_init(); #endif if((retcode = drm_ctxbitmap_init(dev))) { @@ -368,7 +368,7 @@ void tdfx_cleanup(void) } drm_ctxbitmap_cleanup(dev); tdfx_takedown(dev); -#ifdef CONFIG_DRM_AGP +#ifdef DRM_AGP if (dev->agp) { drm_agp_uninit(); drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS); |