diff options
author | Rik Faith <faith@alephnull.com> | 2000-08-04 10:04:55 +0000 |
---|---|---|
committer | Rik Faith <faith@alephnull.com> | 2000-08-04 10:04:55 +0000 |
commit | f3ae6786f89a4f63dbba93c5519d3792a1744dd7 (patch) | |
tree | 0d9ef964855fc32189fd5553373bb9dcf904ed12 /linux/r128_bufs.c | |
parent | bcad11818296fa58a356175bc7e13060579012d0 (diff) |
Sync with Linux 2.4.0-test6-pre2
Diffstat (limited to 'linux/r128_bufs.c')
-rw-r--r-- | linux/r128_bufs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/r128_bufs.c b/linux/r128_bufs.c index e8ff4df4..bd81dcdc 100644 --- a/linux/r128_bufs.c +++ b/linux/r128_bufs.c @@ -31,12 +31,13 @@ */ #define __NO_VERSION__ +#include <linux/config.h> #include "drmP.h" #include "r128_drv.h" #include "linux/un.h" -#ifdef DRM_AGP +#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) int r128_addbufs_agp(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { @@ -199,7 +200,7 @@ int r128_addbufs(struct inode *inode, struct file *filp, unsigned int cmd, sizeof(request), -EFAULT); -#ifdef DRM_AGP +#if defined(CONFIG_AGP) || defined(CONFIG_AGP_MODULE) if (request.flags & _DRM_AGP_BUFFER) return r128_addbufs_agp(inode, filp, cmd, arg); else |