summaryrefslogtreecommitdiff
path: root/linux/memory.c
diff options
context:
space:
mode:
authorRik Faith <faith@alephnull.com>2000-07-21 14:20:57 +0000
committerRik Faith <faith@alephnull.com>2000-07-21 14:20:57 +0000
commit81da79d1ed038ff8968abcf1cde3362035603861 (patch)
treeaf8d628fec94dc69839ee0dcf2686567947c4db3 /linux/memory.c
parent6d1ce8fe7727ee0a704a8a7464b22559ce9831fd (diff)
Changes to make AGP optional for in-kernel builds
Diffstat (limited to 'linux/memory.c')
-rw-r--r--linux/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/memory.c b/linux/memory.c
index 4d623ef3..d03e214e 100644
--- a/linux/memory.c
+++ b/linux/memory.c
@@ -197,7 +197,7 @@ void drm_free(void *pt, size_t size, int area)
int free_count;
if (!pt) DRM_MEM_ERROR(area, "Attempt to free NULL pointer\n");
- else kfree(pt, size);
+ else kfree(pt);
spin_lock(&drm_mem_lock);
drm_mem_stats[area].bytes_freed += size;
free_count = ++drm_mem_stats[area].free_count;
@@ -330,7 +330,7 @@ void drm_ioremapfree(void *pt, unsigned long size)
}
}
-#ifdef DRM_AGP
+#ifdef CONFIG_DRM_AGP
agp_memory *drm_alloc_agp(int pages, u32 type)
{
agp_memory *handle;