diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-03-08 16:04:47 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-10 13:06:04 +0000 |
| commit | 699f0b45cef8259790ca7a8811d4e6bccc4b54a9 (patch) | |
| tree | 50ad899e896efe780a39438162e867648fb2c2c9 /include/drm/gma_drm.h | |
| parent | 670c044454a33ab679628518d5284fac6246b259 (diff) | |
| download | linux-stable-699f0b45cef8259790ca7a8811d4e6bccc4b54a9.tar.gz linux-stable-699f0b45cef8259790ca7a8811d4e6bccc4b54a9.tar.bz2 linux-stable-699f0b45cef8259790ca7a8811d4e6bccc4b54a9.zip | |
gma500: fix ioctl confict
Move DRM_GMA_GET_PIPE_FROM_CRTC_ID to 0x08 to avoid confict with
DRM_GMA_GEM_MMAP.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/gma_drm.h')
| -rw-r--r-- | include/drm/gma_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/gma_drm.h b/include/drm/gma_drm.h index 113686785717..884613ee00ad 100644 --- a/include/drm/gma_drm.h +++ b/include/drm/gma_drm.h @@ -83,9 +83,9 @@ struct drm_psb_gem_mmap { #define DRM_GMA_GAMMA 0x04 /* Set gamma table */ #define DRM_GMA_ADB 0x05 /* Get backlight */ #define DRM_GMA_DPST_BL 0x06 /* Set backlight */ -#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x1 /* CRTC to physical pipe# */ #define DRM_GMA_MODE_OPERATION 0x07 /* Mode validation/DC set */ #define PSB_MODE_OPERATION_MODE_VALID 0x01 +#define DRM_GMA_GET_PIPE_FROM_CRTC_ID 0x08 /* CRTC to physical pipe# */ #endif |