commit 1910836426f202240364a96527a503396b622072
author Nick Kralevich <nnk@google.com> Mon Jan 14 14:32:55 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 14 14:32:55 2013 -0800
tree 177a6157046019a43fbc68aa17d78b5bc260ed44
parent e83b26af3686c2a1c466e2a46d99052475a51024
parent 8b8b0880f9849de6fd29fef37ba797c06ba64e50

am 8b8b0880: Merge "update auxvec.h from upstream."

* commit '8b8b0880f9849de6fd29fef37ba797c06ba64e50':
  update auxvec.h from upstream.

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;