33 files changed, 53 insertions, 53 deletions

diff --git a/Android.mk b/Android.mk
index 7f84a04..4373b6d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,18 +51,18 @@ LOCAL_SRC_FILES := \
 	samsung-ipc/ipc.c \
 	samsung-ipc/ipc_devices.c \
 	samsung-ipc/ipc_util.c \
-	samsung-ipc/device/xmm6160/xmm6160.c \
-	samsung-ipc/device/xmm6260/xmm6260.c \
-	samsung-ipc/device/xmm6260/xmm6260_hsic.c \
-	samsung-ipc/device/xmm6260/xmm6260_mipi.c \
-	samsung-ipc/device/xmm6260/xmm6260_sec_modem.c \
-	samsung-ipc/device/crespo/crespo_ipc.c \
-	samsung-ipc/device/aries/aries_ipc.c \
-	samsung-ipc/device/galaxys2/galaxys2_ipc.c \
-	samsung-ipc/device/maguro/maguro_ipc.c \
-	samsung-ipc/device/piranha/piranha_ipc.c \
-	samsung-ipc/device/i9300/i9300_ipc.c \
-	samsung-ipc/device/n7100/n7100_ipc.c \
+	samsung-ipc/devices/xmm6160/xmm6160.c \
+	samsung-ipc/devices/xmm6260/xmm6260.c \
+	samsung-ipc/devices/xmm6260/xmm6260_hsic.c \
+	samsung-ipc/devices/xmm6260/xmm6260_mipi.c \
+	samsung-ipc/devices/xmm6260/xmm6260_sec_modem.c \
+	samsung-ipc/devices/crespo/crespo_ipc.c \
+	samsung-ipc/devices/aries/aries_ipc.c \
+	samsung-ipc/devices/galaxys2/galaxys2_ipc.c \
+	samsung-ipc/devices/maguro/maguro_ipc.c \
+	samsung-ipc/devices/piranha/piranha_ipc.c \
+	samsung-ipc/devices/i9300/i9300_ipc.c \
+	samsung-ipc/devices/n7100/n7100_ipc.c \
 	samsung-ipc/util.c \
 	samsung-ipc/call.c \
 	samsung-ipc/sms.c \
@@ -76,8 +76,8 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/samsung-ipc \
-	$(LOCAL_PATH)/samsung-ipc/device/xmm6160/ \
-	$(LOCAL_PATH)/samsung-ipc/device/xmm6260/ \
+	$(LOCAL_PATH)/samsung-ipc/devices/xmm6160/ \
+	$(LOCAL_PATH)/samsung-ipc/devices/xmm6260/ \
 	external/openssl/include
 
 LOCAL_CFLAGS += \
diff --git a/samsung-ipc/Makefile.am b/samsung-ipc/Makefile.am
index 0cb672b..3a93959 100644
--- a/samsung-ipc/Makefile.am
+++ b/samsung-ipc/Makefile.am
@@ -3,8 +3,8 @@ NULL =
 AM_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/samsung-ipc \
-	-I$(top_srcdir)/samsung-ipc/device/xmm6160 \
-	-I$(top_srcdir)/samsung-ipc/device/xmm6260 \
+	-I$(top_srcdir)/samsung-ipc/devices/xmm6160 \
+	-I$(top_srcdir)/samsung-ipc/devices/xmm6260 \
 	$(OPENSSL_CFLAGS) \
 	$(NULL)
 
@@ -22,36 +22,36 @@ libsamsung_ipc_la_SOURCES = \
 	ipc_devices.c \
 	ipc_devices.h \
 	ipc_util.c \
-	device/xmm6160/xmm6160.c \
-	device/xmm6160/xmm6160.h \
-	device/xmm6260/xmm6260.c \
-	device/xmm6260/xmm6260.h \
-	device/xmm6260/xmm6260_hsic.c \
-	device/xmm6260/xmm6260_hsic.h \
-	device/xmm6260/xmm6260_mipi.c \
-	device/xmm6260/xmm6260_mipi.h \
-	device/xmm6260/xmm6260_sec_modem.c \
-	device/xmm6260/xmm6260_sec_modem.h \
-	device/xmm6260/modem.h \
-	device/xmm6260/modem_link_device_hsic.h \
-	device/xmm6260/modem_prj.h \
-	device/crespo/crespo_ipc.c \
-	device/crespo/crespo_ipc.h \
-	device/crespo/crespo_modem_ctl.h \
-	device/aries/aries_ipc.c \
-	device/aries/aries_ipc.h \
-	device/aries/onedram.h \
-	device/aries/phonet.h \
-	device/galaxys2/galaxys2_ipc.c \
-	device/galaxys2/galaxys2_ipc.h \
-	device/maguro/maguro_ipc.c \
-	device/maguro/maguro_ipc.h \
-	device/piranha/piranha_ipc.c \
-	device/piranha/piranha_ipc.h \
-	device/i9300/i9300_ipc.c \
-	device/i9300/i9300_ipc.h \
-	device/n7100/n7100_ipc.c \
-	device/n7100/n7100_ipc.h \
+	devices/xmm6160/xmm6160.c \
+	devices/xmm6160/xmm6160.h \
+	devices/xmm6260/xmm6260.c \
+	devices/xmm6260/xmm6260.h \
+	devices/xmm6260/xmm6260_hsic.c \
+	devices/xmm6260/xmm6260_hsic.h \
+	devices/xmm6260/xmm6260_mipi.c \
+	devices/xmm6260/xmm6260_mipi.h \
+	devices/xmm6260/xmm6260_sec_modem.c \
+	devices/xmm6260/xmm6260_sec_modem.h \
+	devices/xmm6260/modem.h \
+	devices/xmm6260/modem_link_device_hsic.h \
+	devices/xmm6260/modem_prj.h \
+	devices/crespo/crespo_ipc.c \
+	devices/crespo/crespo_ipc.h \
+	devices/crespo/crespo_modem_ctl.h \
+	devices/aries/aries_ipc.c \
+	devices/aries/aries_ipc.h \
+	devices/aries/onedram.h \
+	devices/aries/phonet.h \
+	devices/galaxys2/galaxys2_ipc.c \
+	devices/galaxys2/galaxys2_ipc.h \
+	devices/maguro/maguro_ipc.c \
+	devices/maguro/maguro_ipc.h \
+	devices/piranha/piranha_ipc.c \
+	devices/piranha/piranha_ipc.h \
+	devices/i9300/i9300_ipc.c \
+	devices/i9300/i9300_ipc.h \
+	devices/n7100/n7100_ipc.c \
+	devices/n7100/n7100_ipc.h \
 	util.c \
 	util.h \
 	call.c \
diff --git a/samsung-ipc/device/aries/aries_ipc.c b/samsung-ipc/devices/aries/aries_ipc.c
index 97df116..97df116 100644
--- a/samsung-ipc/device/aries/aries_ipc.c
+++ b/samsung-ipc/devices/aries/aries_ipc.c
diff --git a/samsung-ipc/device/aries/aries_ipc.h b/samsung-ipc/devices/aries/aries_ipc.h
index e410dd2..e410dd2 100644
--- a/samsung-ipc/device/aries/aries_ipc.h
+++ b/samsung-ipc/devices/aries/aries_ipc.h
diff --git a/samsung-ipc/device/aries/onedram.h b/samsung-ipc/devices/aries/onedram.h
index 9c69c76..9c69c76 100644
--- a/samsung-ipc/device/aries/onedram.h
+++ b/samsung-ipc/devices/aries/onedram.h
diff --git a/samsung-ipc/device/aries/phonet.h b/samsung-ipc/devices/aries/phonet.h
index cda62c8..cda62c8 100644
--- a/samsung-ipc/device/aries/phonet.h
+++ b/samsung-ipc/devices/aries/phonet.h
diff --git a/samsung-ipc/device/crespo/crespo_ipc.c b/samsung-ipc/devices/crespo/crespo_ipc.c
index 457cd48..457cd48 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.c
+++ b/samsung-ipc/devices/crespo/crespo_ipc.c
diff --git a/samsung-ipc/device/crespo/crespo_ipc.h b/samsung-ipc/devices/crespo/crespo_ipc.h
index 85bf21d..85bf21d 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.h
+++ b/samsung-ipc/devices/crespo/crespo_ipc.h
diff --git a/samsung-ipc/device/crespo/crespo_modem_ctl.h b/samsung-ipc/devices/crespo/crespo_modem_ctl.h
index 7c23165..7c23165 100644
--- a/samsung-ipc/device/crespo/crespo_modem_ctl.h
+++ b/samsung-ipc/devices/crespo/crespo_modem_ctl.h
diff --git a/samsung-ipc/device/galaxys2/galaxys2_ipc.c b/samsung-ipc/devices/galaxys2/galaxys2_ipc.c
index 5c1c9c3..5c1c9c3 100644
--- a/samsung-ipc/device/galaxys2/galaxys2_ipc.c
+++ b/samsung-ipc/devices/galaxys2/galaxys2_ipc.c
diff --git a/samsung-ipc/device/galaxys2/galaxys2_ipc.h b/samsung-ipc/devices/galaxys2/galaxys2_ipc.h
index b8b6a12..b8b6a12 100644
--- a/samsung-ipc/device/galaxys2/galaxys2_ipc.h
+++ b/samsung-ipc/devices/galaxys2/galaxys2_ipc.h
diff --git a/samsung-ipc/device/i9300/i9300_ipc.c b/samsung-ipc/devices/i9300/i9300_ipc.c
index 59c2eb5..59c2eb5 100644
--- a/samsung-ipc/device/i9300/i9300_ipc.c
+++ b/samsung-ipc/devices/i9300/i9300_ipc.c
diff --git a/samsung-ipc/device/i9300/i9300_ipc.h b/samsung-ipc/devices/i9300/i9300_ipc.h
index 6eceb21..6eceb21 100644
--- a/samsung-ipc/device/i9300/i9300_ipc.h
+++ b/samsung-ipc/devices/i9300/i9300_ipc.h
diff --git a/samsung-ipc/device/maguro/maguro_ipc.c b/samsung-ipc/devices/maguro/maguro_ipc.c
index 9b824a0..9b824a0 100644
--- a/samsung-ipc/device/maguro/maguro_ipc.c
+++ b/samsung-ipc/devices/maguro/maguro_ipc.c
diff --git a/samsung-ipc/device/maguro/maguro_ipc.h b/samsung-ipc/devices/maguro/maguro_ipc.h
index 67836ba..67836ba 100644
--- a/samsung-ipc/device/maguro/maguro_ipc.h
+++ b/samsung-ipc/devices/maguro/maguro_ipc.h
diff --git a/samsung-ipc/device/n7100/n7100_ipc.c b/samsung-ipc/devices/n7100/n7100_ipc.c
index 03c30dc..03c30dc 100644
--- a/samsung-ipc/device/n7100/n7100_ipc.c
+++ b/samsung-ipc/devices/n7100/n7100_ipc.c
diff --git a/samsung-ipc/device/n7100/n7100_ipc.h b/samsung-ipc/devices/n7100/n7100_ipc.h
index a081315..a081315 100644
--- a/samsung-ipc/device/n7100/n7100_ipc.h
+++ b/samsung-ipc/devices/n7100/n7100_ipc.h
diff --git a/samsung-ipc/device/piranha/piranha_ipc.c b/samsung-ipc/devices/piranha/piranha_ipc.c
index 5bdd0cd..5bdd0cd 100644
--- a/samsung-ipc/device/piranha/piranha_ipc.c
+++ b/samsung-ipc/devices/piranha/piranha_ipc.c
diff --git a/samsung-ipc/device/piranha/piranha_ipc.h b/samsung-ipc/devices/piranha/piranha_ipc.h
index 5c857fc..5c857fc 100644
--- a/samsung-ipc/device/piranha/piranha_ipc.h
+++ b/samsung-ipc/devices/piranha/piranha_ipc.h
diff --git a/samsung-ipc/device/xmm6160/xmm6160.c b/samsung-ipc/devices/xmm6160/xmm6160.c
index 8374541..8374541 100644
--- a/samsung-ipc/device/xmm6160/xmm6160.c
+++ b/samsung-ipc/devices/xmm6160/xmm6160.c
diff --git a/samsung-ipc/device/xmm6160/xmm6160.h b/samsung-ipc/devices/xmm6160/xmm6160.h
index 2d2bdf9..2d2bdf9 100644
--- a/samsung-ipc/device/xmm6160/xmm6160.h
+++ b/samsung-ipc/devices/xmm6160/xmm6160.h
diff --git a/samsung-ipc/device/xmm6260/modem.h b/samsung-ipc/devices/xmm6260/modem.h
index 5a456f5..5a456f5 100644
--- a/samsung-ipc/device/xmm6260/modem.h
+++ b/samsung-ipc/devices/xmm6260/modem.h
diff --git a/samsung-ipc/device/xmm6260/modem_link_device_hsic.h b/samsung-ipc/devices/xmm6260/modem_link_device_hsic.h
index 99e15cf..99e15cf 100755
--- a/samsung-ipc/device/xmm6260/modem_link_device_hsic.h
+++ b/samsung-ipc/devices/xmm6260/modem_link_device_hsic.h
diff --git a/samsung-ipc/device/xmm6260/modem_prj.h b/samsung-ipc/devices/xmm6260/modem_prj.h
index 99f6087..99f6087 100644
--- a/samsung-ipc/device/xmm6260/modem_prj.h
+++ b/samsung-ipc/devices/xmm6260/modem_prj.h
diff --git a/samsung-ipc/device/xmm6260/xmm6260.c b/samsung-ipc/devices/xmm6260/xmm6260.c
index 416f6c2..416f6c2 100644
--- a/samsung-ipc/device/xmm6260/xmm6260.c
+++ b/samsung-ipc/devices/xmm6260/xmm6260.c
diff --git a/samsung-ipc/device/xmm6260/xmm6260.h b/samsung-ipc/devices/xmm6260/xmm6260.h
index 64f7938..64f7938 100644
--- a/samsung-ipc/device/xmm6260/xmm6260.h
+++ b/samsung-ipc/devices/xmm6260/xmm6260.h
diff --git a/samsung-ipc/device/xmm6260/xmm6260_hsic.c b/samsung-ipc/devices/xmm6260/xmm6260_hsic.c
index e4162ae..e4162ae 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_hsic.c
+++ b/samsung-ipc/devices/xmm6260/xmm6260_hsic.c
diff --git a/samsung-ipc/device/xmm6260/xmm6260_hsic.h b/samsung-ipc/devices/xmm6260/xmm6260_hsic.h
index 4e25bce..4e25bce 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_hsic.h
+++ b/samsung-ipc/devices/xmm6260/xmm6260_hsic.h
diff --git a/samsung-ipc/device/xmm6260/xmm6260_mipi.c b/samsung-ipc/devices/xmm6260/xmm6260_mipi.c
index df31755..df31755 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_mipi.c
+++ b/samsung-ipc/devices/xmm6260/xmm6260_mipi.c
diff --git a/samsung-ipc/device/xmm6260/xmm6260_mipi.h b/samsung-ipc/devices/xmm6260/xmm6260_mipi.h
index 4c9d7d2..4c9d7d2 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_mipi.h
+++ b/samsung-ipc/devices/xmm6260/xmm6260_mipi.h
diff --git a/samsung-ipc/device/xmm6260/xmm6260_sec_modem.c b/samsung-ipc/devices/xmm6260/xmm6260_sec_modem.c
index d3ddfae..d3ddfae 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_sec_modem.c
+++ b/samsung-ipc/devices/xmm6260/xmm6260_sec_modem.c
diff --git a/samsung-ipc/device/xmm6260/xmm6260_sec_modem.h b/samsung-ipc/devices/xmm6260/xmm6260_sec_modem.h
index 8895fbb..8895fbb 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_sec_modem.h
+++ b/samsung-ipc/devices/xmm6260/xmm6260_sec_modem.h
diff --git a/samsung-ipc/ipc_devices.h b/samsung-ipc/ipc_devices.h
index 8fc238f..b93de60 100644
--- a/samsung-ipc/ipc_devices.h
+++ b/samsung-ipc/ipc_devices.h
@@ -20,13 +20,13 @@
 
 #include <samsung-ipc.h>
 
-#include "device/crespo/crespo_ipc.h"
-#include "device/aries/aries_ipc.h"
-#include "device/galaxys2/galaxys2_ipc.h"
-#include "device/maguro/maguro_ipc.h"
-#include "device/piranha/piranha_ipc.h"
-#include "device/i9300/i9300_ipc.h"
-#include "device/n7100/n7100_ipc.h"
+#include "devices/crespo/crespo_ipc.h"
+#include "devices/aries/aries_ipc.h"
+#include "devices/galaxys2/galaxys2_ipc.h"
+#include "devices/maguro/maguro_ipc.h"
+#include "devices/piranha/piranha_ipc.h"
+#include "devices/i9300/i9300_ipc.h"
+#include "devices/n7100/n7100_ipc.h"
 
 #ifndef __IPC_DEVICES_H__
 #define __IPC_DEVICES_H__