diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-09-06 12:11:57 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-09-06 12:11:57 +0000 |
| commit | 68380d1373cf7b01a6ae5c9440de7a52745af091 (patch) | |
| tree | 42c623666b8746dae59e7ed2423a19ebaa68b9cd /linux/r128_bufs.c | |
| parent | a2020a33349c91a0036b1fde8ae0d0229ae8e005 (diff) | |
Merge trunk into tdfx-2-1-branchtdfx-2-1-20000906
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 e8ff4df43..bd81dcdc0 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 |