From: DaiYoung Kim <daiyoung777.kim@samsung.com>
Date: Wed, 17 Jul 2013 11:28:08 +0000 (+0900)
Subject: Merge branch 'ecp' of rsa-git:/sdk/emulator/qemu into ecp
X-Git-Tag: TizenStudio_2.0_p2.3~743^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ee990f2c69421696c5c558e3a592be38221adfb;p=sdk%2Femulator%2Fqemu.git

Merge branch 'ecp' of rsa-git:/sdk/emulator/qemu into ecp
---

2ee990f2c69421696c5c558e3a592be38221adfb
diff --cc tizen/src/Makefile.tizen
index c2487b0,de36836..bc2f33e
--- a/tizen/src/Makefile.tizen
+++ b/tizen/src/Makefile.tizen
@@@ -107,12 -105,8 +107,12 @@@ endi
  obj-y += debug_ch.o
  
  # ecs
- obj-y += ecs_msg.o ecs.o ecs-json-streamer.o qmp_handler.o
+ obj-y += ecs_msg.o ecs.o ecs-json-streamer.o qmp_handler.o ecs_sensor.o
  
 +# ecs msg
 +obj-y += ecs.pb-c.o
 +
 +
  # maru hardware
  include $(SRC_PATH)/tizen/src/Makefile.tizen.$(TARGET_BASE_ARCH)
  
diff --cc tizen/src/hw/maru_device_ids.h
index deda802,3775a25..3775a25
mode 100644,100755..100644
--- a/tizen/src/hw/maru_device_ids.h
+++ b/tizen/src/hw/maru_device_ids.h