From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 9 Jul 2013 08:01:50 +0000 (+0900)
Subject: Merging.....
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~41^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a38d7d36e3f9209b5f978cab1d12657a6991628;p=sdk%2Femulator%2Fqemu.git

Merging.....

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

diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c
index 520e8c5bb7..41ab491420 100644
--- a/tizen/src/skin/maruskin_operation.c
+++ b/tizen/src/skin/maruskin_operation.c
@@ -27,12 +27,15 @@
  *
  */
 
-
-#include "maru_common.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <pthread.h>
+
+#include "qemu/sockets.h"
+#include "sysemu/sysemu.h"
+#include "hw/sysbus.h"
+
+#include "maru_common.h"
 #include "maruskin_operation.h"
 #include "hw/maru_brightness.h"
 #include "hw/maru_virtio_hwkey.h"
@@ -40,15 +43,12 @@
 #include "emulator.h"
 #include "debug_ch.h"
 #include "sdb.h"
-#include "qemu_socket.h"
 #include "mloop_event.h"
 #include "emul_state.h"
 #include "maruskin_keymap.h"
 #include "maruskin_server.h"
 #include "emul_state.h"
 #include "hw/maru_pm.h"
-#include "sysemu.h"
-#include "sysbus.h"
 
 #ifdef CONFIG_HAX
 #include "guest_debug.h"