From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 15 Mar 2013 16:03:15 +0000 (+0900)
Subject: merge with master
X-Git-Tag: accepted/tizen/20130530.164304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Faccepted%2Ftizen%2F20130530.164304;p=adaptation%2Fintel_mfld%2Fdevice-manager-plugin-mfld-blackbay.git

merge with master
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d125783..1538bf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs REQUIRED devman_plugin alsa dlog iniparser svi)
+pkg_check_modules(pkgs REQUIRED devman devman_plugin alsa dlog iniparser svi)
 
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
diff --git a/src/test/slp_plugin_test.c b/src/test/slp_plugin_test.c
index 09360c3..b7e0c67 100644
--- a/src/test/slp_plugin_test.c
+++ b/src/test/slp_plugin_test.c
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <devman/devman_plugin_intf.h>
-#include <devman/devman.h>
+#include <devman_plugin_intf.h>
+#include <devman.h>
 #include <svi.h>
 
 #define TEST_GET(_func, _value) {\