diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-06 02:08:07 -0400 |
| commit | ea2aca084ba82aaf7c148d04914ceed8758ce08a (patch) | |
| tree | dcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79 /drivers/char/drm/drm.h | |
| parent | f3032be921cd126615ce3bfd7084e3d319f3f892 (diff) | |
| parent | c5a78ac00c400df29645e59938700301efb371d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
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 { | |||
| 628 | #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) | 628 | #define DRM_IOCTL_AGP_BIND DRM_IOW( 0x36, struct drm_agp_binding) |
| 629 | #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) | 629 | #define DRM_IOCTL_AGP_UNBIND DRM_IOW( 0x37, struct drm_agp_binding) |
| 630 | 630 | ||
| 631 | #define DRM_IOCTL_SG_ALLOC DRM_IOW( 0x38, struct drm_scatter_gather) | 631 | #define DRM_IOCTL_SG_ALLOC DRM_IOWR(0x38, struct drm_scatter_gather) |
| 632 | #define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) | 632 | #define DRM_IOCTL_SG_FREE DRM_IOW( 0x39, struct drm_scatter_gather) |
| 633 | 633 | ||
| 634 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) | 634 | #define DRM_IOCTL_WAIT_VBLANK DRM_IOWR(0x3a, union drm_wait_vblank) |