diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-28 23:18:56 +0000 |
| commit | 4d657aa39d5bcae60c2c11bf8fb66692ddd1c9e7 (patch) | |
| tree | 30f3b08741a4d4b98b16bd99ea2757ff715d1c11 /drivers/char/drm/r128_bufs.c | |
| parent | eed6b7c84cc33f229f6fecd884d9a22af5bec514 (diff) | |
Merge with 2.4.0-test5 final.
Diffstat (limited to 'drivers/char/drm/r128_bufs.c')
| -rw-r--r-- | drivers/char/drm/r128_bufs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/r128_bufs.c b/drivers/char/drm/r128_bufs.c index e8ff4df43..d02fc5e00 100644 --- a/drivers/char/drm/r128_bufs.c +++ b/drivers/char/drm/r128_bufs.c @@ -36,7 +36,7 @@ #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 +199,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 |