diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:52:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:52:35 -0700 |
| commit | 5335a40be6867eff986a31bcd8fc82a5cb1e16bb (patch) | |
| tree | b32be59c2a2679a5cc3fef172006886f7dcd2466 /drivers/char/drm/drm_os_linux.h | |
| parent | 393bfca19ecdce60a8d9a4d2577cac11ca924a25 (diff) | |
| parent | ef68d295508d52e792abf70d4f84461104d33b9d (diff) | |
| download | blackbird-op-linux-5335a40be6867eff986a31bcd8fc82a5cb1e16bb.tar.gz blackbird-op-linux-5335a40be6867eff986a31bcd8fc82a5cb1e16bb.zip | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
via: Make sure we flush write-combining using a follow-up read.
via: Try to improve command-buffer chaining.
drm: remove old taskqueue remnant
drm: rename badly named define and cleanup ioctl code spacing
radeon: Don't mess up page flipping when a file descriptor is closed.
drm/radeon: upgrade to 1.27 - make PCI GART more flexible
Diffstat (limited to 'drivers/char/drm/drm_os_linux.h')
| -rw-r--r-- | drivers/char/drm/drm_os_linux.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h index 2908b72daa6e..0fe7b4497927 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/drivers/char/drm/drm_os_linux.h @@ -70,9 +70,6 @@ static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) #endif -/** Task queue handler arguments */ -#define DRM_TASKQUEUE_ARGS void *arg - /** For data going into the kernel through the ioctl argument */ #define DRM_COPY_FROM_USER_IOCTL(arg1, arg2, arg3) \ if ( copy_from_user(&arg1, arg2, arg3) ) \ |
