From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 24 Apr 2014 12:29:02 +0000 (+0900)
Subject: build: fix invalid merge
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=534927c4fa134b093731d1a843ca8d2d216e9e49;p=sdk%2Femulator%2Fqemu.git

build: fix invalid merge

Change-Id: I201f1ed69be602742e988ae8be513f2ff7ff96a5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/tizen/src/hw/maru_virtio_touchscreen.h b/tizen/src/hw/maru_virtio_touchscreen.h
index 06334a4ffa..61d7287196 100644
--- a/tizen/src/hw/maru_virtio_touchscreen.h
+++ b/tizen/src/hw/maru_virtio_touchscreen.h
@@ -48,7 +48,6 @@ typedef struct VirtIOTouchscreen {
 
     QEMUBH *bh;
     DeviceState *qdev;
-    QEMUPutMouseEntry *eh_entry;
 
     unsigned int max_finger;
 } VirtIOTouchscreen;
@@ -60,7 +59,7 @@ typedef struct EmulTouchEvent {
 } EmulTouchEvent;
 
 
-void virtio_touchscreen_event(void *opaque, int x, int y, int z, int buttons_state);
+void virtio_touchscreen_event(int x, int y, int z, int buttons_state);
 void maru_virtio_touchscreen_notify(void);
 
 #endif /* MARU_TOUCHSCREEN_H_ */