diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 17:26:43 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2002-09-23 17:26:43 +0000 |
| commit | f1c8fe95578e15d5eece6ad52540ce2c7c671f70 (patch) | |
| tree | dfd6a35378df1848c9d2aa40129e6c869b00980d /linux | |
| parent | cfa1a918b6d6b2d0fd9ae0f58f5b86a15c443dcb (diff) | |
merged r200-0-2-branch to trunk
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile.linux | 2 | ||||
| -rw-r--r-- | linux/drm_os_linux.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 7bae33a5..7c3f1db9 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -55,7 +55,7 @@ TDFXHEADERS = tdfx.h $(DRMHEADERS) $(DRMTEMPLATES) R128OBJS = r128_drv.o r128_cce.o r128_state.o R128HEADERS = r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES) -RADEONOBJS = radeon_drv.o radeon_cp.o radeon_state.o +RADEONOBJS = radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o RADEONHEADERS = radeon.h radeon_drv.h radeon_drm.h $(DRMHEADERS) \ $(DRMTEMPLATES) diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h index 8c073f0b..cb304398 100644 --- a/linux/drm_os_linux.h +++ b/linux/drm_os_linux.h @@ -16,6 +16,9 @@ #define DRM_DEVICE drm_file_t *priv = filp->private_data; \ drm_device_t *dev = priv->dev +#define DRM_IRQ_ARGS int irq, void *arg, struct pt_regs *regs +#define DRM_TASKQUEUE_ARGS void *arg + /* For data going from/to the kernel through the ioctl argument */ #define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3) \ if ( copy_from_user(&arg1, arg2, arg3) ) \ |