diff --git a/[refs] b/[refs]
index 58ac873546e2..96b75ec922ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69155fd66d340d47cf25eff0099b3e13548ed50c
+refs/heads/master: 027c0a6af42efa4f2f6034421349bd26a3ca4923
diff --git a/trunk/arch/arm/plat-mxc/devices/platform-mx2-emma.c b/trunk/arch/arm/mach-imx/devices/platform-mx2-emma.c
similarity index 94%
rename from trunk/arch/arm/plat-mxc/devices/platform-mx2-emma.c
rename to trunk/arch/arm/mach-imx/devices/platform-mx2-emma.c
index 508404ddd4ea..11bd01d402f2 100644
--- a/trunk/arch/arm/plat-mxc/devices/platform-mx2-emma.c
+++ b/trunk/arch/arm/mach-imx/devices/platform-mx2-emma.c
@@ -6,8 +6,8 @@
  * the terms of the GNU General Public License version 2 as published by the
  * Free Software Foundation.
  */
-#include <mach/hardware.h>
-#include <mach/devices-common.h>
+#include "../hardware.h"
+#include "devices-common.h"
 
 #define imx_mx2_emmaprp_data_entry_single(soc)				\
 	{								\