From 2c4b1b81d53a1ba5f29b93dc6f61c882fd3e8fd2 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@starflyer.(none)>
Date: Tue, 23 Aug 2005 12:15:43 +1000
Subject: [PATCH] --- yaml --- r: 6498 b: refs/heads/master c:
 7a9aff3cff807261e476a1719273a4ac5d254ecb h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/char/drm/drm_agpsupport.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b196a56c0932..126ec8a468b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88f399cd0a5a540db2815eee3002f8f00ef6461e
+refs/heads/master: 7a9aff3cff807261e476a1719273a4ac5d254ecb
diff --git a/trunk/drivers/char/drm/drm_agpsupport.c b/trunk/drivers/char/drm/drm_agpsupport.c
index ffb4acaefe84..8c215adcb4b2 100644
--- a/trunk/drivers/char/drm/drm_agpsupport.c
+++ b/trunk/drivers/char/drm/drm_agpsupport.c
@@ -426,13 +426,8 @@ drm_agp_head_t *drm_agp_init(drm_device_t *dev)
 		return NULL;
 	}
 	head->memory = NULL;
-#if LINUX_VERSION_CODE <= 0x020408
-	head->cant_use_aperture = 0;
-	head->page_mask = ~(0xfff);
-#else
 	head->cant_use_aperture = head->agp_info.cant_use_aperture;
 	head->page_mask = head->agp_info.page_mask;
-#endif
 
 	return head;
 }