diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:30:23 +0200 |
| commit | 1de8644cc7c826e0c41e52825bd5a12e2e31e6ca (patch) | |
| tree | df1e884080599facaf70d2675c480e999da953e1 /drivers/char/drm/drm.h | |
| parent | 6c3df25511c2c51f2dd36cc52a8d22363d731793 (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
Merge branch 'linus' into sched/develtip-sched-devel-2008-06-23_09.30_Mon
Diffstat (limited to 'drivers/char/drm/drm.h')
| -rw-r--r-- | drivers/char/drm/drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 3a05c6d5ebe1..38d3c6b8276a 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -628,7 +628,7 @@ struct drm_set_version { #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) -#define DRM_IOCTL_SG_ALLOC DRM_IOW( 0x38, struct drm_scatter_gather) +#define DRM_IOCTL_SG_ALLOC DRM_IOWR(0x38, struct drm_scatter_gather) #define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) |