commit 49d89c070cb2d2599f86491679fb29d567cc58dc
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 12:22:58 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 12:22:58 2013 -0700
tree fc79850770acd5f1fe0d6bb30cd272e3d1cef3fa
parent b21bb2dacea1e5b80d7ee4da306e6482c0160bcd
parent 31173957b2c2b23fca16056411d0cc4c3bb3029a

am 31173957: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '31173957b2c2b23fca16056411d0cc4c3bb3029a':

original/linux/msm_mdp.h

diff --git a/original/linux/msm_mdp.h b/original/linux/msm_mdp.h
index 11861e1..5fdc390 100755
--- a/original/linux/msm_mdp.h
+++ b/original/linux/msm_mdp.h
@@ -71,7 +71,7 @@
 #define MSMFB_OVERLAY_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 160, unsigned int)
 #define MSMFB_VSYNC_CTRL  _IOW(MSMFB_IOCTL_MAGIC, 161, unsigned int)
 #define MSMFB_BUFFER_SYNC  _IOW(MSMFB_IOCTL_MAGIC, 162, struct mdp_buf_sync)
-#define MSMFB_OVERLAY_COMMIT      _IOW(MSMFB_IOCTL_MAGIC, 163, unsigned int)
+
 #define MSMFB_DISPLAY_COMMIT      _IOW(MSMFB_IOCTL_MAGIC, 164, \
 						struct mdp_display_commit)
 
@@ -506,6 +506,8 @@
 	int rel_fen_fd[MDP_MAX_FENCE_FD];
 };
 
+#define MDP_DISPLAY_COMMIT_OVERLAY 0x00000001
+
 struct mdp_display_commit {
 	uint32_t flags;
 	uint32_t wait_for_finish;