diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:45:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 07:45:15 -0700 |
| commit | 3cb904caa97f5c193df21b8cdf780a826564baff (patch) | |
| tree | d154725dbf0a7f74a7c0190c9748304ce7885678 /drivers/char/drm/r128_drm.h | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
| parent | 7a9aff3cff807261e476a1719273a4ac5d254ecb (diff) | |
| download | talos-obmc-linux-3cb904caa97f5c193df21b8cdf780a826564baff.tar.gz talos-obmc-linux-3cb904caa97f5c193df21b8cdf780a826564baff.zip | |
Merge refs/heads/drm-latest from master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/r128_drm.h')
| -rw-r--r-- | drivers/char/drm/r128_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h index 0cba17d1e0ff..b616cd3ed2cd 100644 --- a/drivers/char/drm/r128_drm.h +++ b/drivers/char/drm/r128_drm.h @@ -215,7 +215,7 @@ typedef struct drm_r128_sarea { #define DRM_IOCTL_R128_INDIRECT DRM_IOWR(DRM_COMMAND_BASE + DRM_R128_INDIRECT, drm_r128_indirect_t) #define DRM_IOCTL_R128_FULLSCREEN DRM_IOW( DRM_COMMAND_BASE + DRM_R128_FULLSCREEN, drm_r128_fullscreen_t) #define DRM_IOCTL_R128_CLEAR2 DRM_IOW( DRM_COMMAND_BASE + DRM_R128_CLEAR2, drm_r128_clear2_t) -#define DRM_IOCTL_R128_GETPARAM DRM_IOW( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t) +#define DRM_IOCTL_R128_GETPARAM DRM_IOWR( DRM_COMMAND_BASE + DRM_R128_GETPARAM, drm_r128_getparam_t) #define DRM_IOCTL_R128_FLIP DRM_IO( DRM_COMMAND_BASE + DRM_R128_FLIP) typedef struct drm_r128_init { |
