Merge branch 'for-linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / include / drm / gma_drm.h

diff --git a/include/drm/gma_drm.h b/include/drm/gma_drm.h
index 113686785717cbf8358b01888182634fc014152e..884613ee00ad88bd6d60a2393d4021c70ac97551 100644 (file)
--- 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