aboutsummaryrefslogtreecommitdiff
path: root/linux-core/r128_drv.c
diff options
context:
space:
mode:
authorRik Faith <faith@alephnull.com>2000-07-21 16:57:00 +0000
committerRik Faith <faith@alephnull.com>2000-07-21 16:57:00 +0000
commit6dd96a15ed329f26565bb971877f03e15801f3f5 (patch)
treece5281124fcdfa73c27d775428c5e7432ec50e2b /linux-core/r128_drv.c
parente38b34e54a79919588f23294ddb326309c9cb005 (diff)
Revert some changes and try alternative way to clean up AGP handling.
Diffstat (limited to 'linux-core/r128_drv.c')
-rw-r--r--linux-core/r128_drv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 18df1d83..e78d0231 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -99,7 +99,7 @@ static drm_ioctl_desc_t r128_ioctls[] = {
[DRM_IOCTL_NR(DRM_IOCTL_UNLOCK)] = { r128_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 },
@@ -244,7 +244,7 @@ static int r128_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 *entry;
@@ -356,7 +356,7 @@ int r128_init(void)
drm_mem_init();
drm_proc_init(dev);
-#ifdef CONFIG_DRM_AGP
+#ifdef DRM_AGP
dev->agp = drm_agp_init();
if (dev->agp == NULL) {
DRM_ERROR("Cannot initialize agpgart module.\n");
@@ -409,7 +409,7 @@ void r128_cleanup(void)
}
drm_ctxbitmap_cleanup(dev);
r128_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);