diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-04-28 12:10:44 +0200 |
| commit | 7f269bec7ed49385de394fdbd970f463ef2060f0 (patch) | |
| tree | 8c45f8c2e11cf101350272f81892cf4cf7678c3a /shared-core/drm.h | |
| parent | 55a9941977953d16b36bbf3e1dcad392ac70e1ef (diff) | |
| parent | 7f8e4060859651993921281445ec00940c577222 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_fops.c
linux-core/drm_lock.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/drm.h')
| -rw-r--r-- | shared-core/drm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/drm.h b/shared-core/drm.h index a72263ae..c847b4ef 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -565,7 +565,6 @@ union drm_wait_vblank { enum drm_hotplug_seq_type { _DRM_HOTPLUG_SIGNAL = 0x00000001, /**< Send signal instead of blocking */ }; - struct drm_wait_hotplug_request { enum drm_hotplug_seq_type type; unsigned long signal; @@ -593,14 +592,15 @@ enum drm_modeset_ctl_cmd { _DRM_POST_MODESET = 2, }; + /** * DRM_IOCTL_MODESET_CTL ioctl argument type * * \sa drmModesetCtl(). */ struct drm_modeset_ctl { - unsigned long arg; - enum drm_modeset_ctl_cmd cmd; + uint32_t crtc; + uint32_t cmd; }; /** |