From 534927c4fa134b093731d1a843ca8d2d216e9e49 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Thu, 24 Apr 2014 21:29:02 +0900 Subject: [PATCH] build: fix invalid merge Change-Id: I201f1ed69be602742e988ae8be513f2ff7ff96a5 Signed-off-by: SeokYeon Hwang --- tizen/src/hw/maru_virtio_touchscreen.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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_ */ -- 2.34.1