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 06334a4ffa64b6d5c0428d77534fa6f39a24c1a0..61d7287196042b3f60e28c906508cb58181f7260 100644 (file)
--- 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_ */