commit 54cfa8364ffa13a1a9a472cea38791ed8c71591a
author Nick Kralevich <nnk@google.com> Thu Feb 07 17:38:23 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 07 17:38:23 2013 -0800
tree b91c459e1f4fdbdd9dd8ef2ae5d6c346003f97fc
parent 601480a0265188593f82986b641e33583fb3aabb
parent cfbe0d8ffb9f57ce12a556f82e2f675f3bc2e863

am cfbe0d8f: Merge "Update xattr.h"

# Via Gerrit Code Review (1) and Nick Kralevich (1)
* commit 'cfbe0d8ffb9f57ce12a556f82e2f675f3bc2e863':
  Update xattr.h

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;