summaryrefslogtreecommitdiffstats
path: root/include/linux/fsl-diu-fb.h
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-11-22 08:51:36 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-11-22 08:51:36 +0000
commite624ae8e0d4243e71daedce7570e91290438eaca (patch)
treee2b9804379a6aab3d2471898d257fe5590feb70c /include/linux/fsl-diu-fb.h
parentc4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff)
parent4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff)
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts: drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'include/linux/fsl-diu-fb.h')
-rw-r--r--include/linux/fsl-diu-fb.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h
index fc295d7ea46..781d4671415 100644
--- a/include/linux/fsl-diu-fb.h
+++ b/include/linux/fsl-diu-fb.h
@@ -54,7 +54,6 @@ struct aoi_display_offset {
};
#define MFB_SET_CHROMA_KEY _IOW('M', 1, struct mfb_chroma_key)
-#define MFB_WAIT_FOR_VSYNC _IOW('F', 0x20, u_int32_t)
#define MFB_SET_BRIGHTNESS _IOW('M', 3, __u8)
#define MFB_SET_ALPHA 0x80014d00