From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 4 Jun 2008 17:17:20 +0000 (+0100)
Subject: Correct prototype for dpy_resize_shared (fix up merge damage)
X-Git-Tag: xen-3.3.0-rc1~103
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=06c0ef7df46783e600c39e407b1499446f46638b;p=qemu-xen-4.1-testing.git

Correct prototype for dpy_resize_shared (fix up merge damage)
---

diff --git a/console.h b/console.h
index 6cb34b90a..1ec937a0e 100644
--- a/console.h
+++ b/console.h
@@ -81,7 +81,7 @@ struct DisplayState {
 
     void (*dpy_update)(struct DisplayState *s, int x, int y, int w, int h);
     void (*dpy_resize)(struct DisplayState *s, int w, int h);
-    void (*dpy_resize_shared)(struct DisplayState *s, int w, int h, int linesize);
+    void (*dpy_resize_shared)(struct DisplayState *s, int w, int h, int depth, int linesize, void *pixels);
     void (*dpy_setdata)(DisplayState *s, void *pixels);
     void (*dpy_refresh)(struct DisplayState *s);
     void (*dpy_copy)(struct DisplayState *s, int src_x, int src_y,