Merge commit '04512dd'

Conflicts:
	hwc/hwc.c

Change-Id: I8e55acb05f4f01aa404296fd200286b4a435e3f9

1 files changed, 1 insertions, 1 deletions

diff --git a/hwc/hwc.c b/hwc/hwc.c
index bc54f12..2762af7 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -831,7 +831,7 @@ static int omap4_hwc_set_best_hdmi_mode(omap4_hwc_device_t *hwc_dev, __u32 xres,
 {
     struct _qdis {
         struct dsscomp_display_info dis;
-        struct dsscomp_videomode modedb[16];
+        struct dsscomp_videomode modedb[32];
     } d = { .dis = { .ix = 1 } };
     omap4_hwc_ext_t *ext = &hwc_dev->ext;