From f3ae6786f89a4f63dbba93c5519d3792a1744dd7 Mon Sep 17 00:00:00 2001
From: Rik Faith <faith@alephnull.com>
Date: Fri, 4 Aug 2000 10:04:55 +0000
Subject: Sync with Linux 2.4.0-test6-pre2

---
 linux/memory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linux/memory.c')

diff --git a/linux/memory.c b/linux/memory.c
index f342bb4f..5023de80 100644
--- a/linux/memory.c
+++ b/linux/memory.c
@@ -30,6 +30,7 @@
  */
 
 #define __NO_VERSION__
+#include <linux/config.h>
 #include "drmP.h"
 
 typedef struct drm_mem_stats {
@@ -330,7 +331,7 @@ void drm_ioremapfree(void *pt, unsigned long size)
 	}
 }
 
-#ifdef DRM_AGP
+#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE)
 agp_memory *drm_alloc_agp(int pages, u32 type)
 {
 	agp_memory *handle;
-- 
cgit v1.2.3