diff --git a/[refs] b/[refs]
index 6ed5c96e4341..6a44d3c9b749 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3372474cfa0dc016f10ec47baddbd1ed0abecf3
+refs/heads/master: e29248c9a7522cb50edd29f2a717be8f323cbeb3
diff --git a/trunk/arch/arm/mach-imx/include/mach/cpuidle.h b/trunk/arch/arm/mach-imx/cpuidle.h
similarity index 100%
rename from trunk/arch/arm/mach-imx/include/mach/cpuidle.h
rename to trunk/arch/arm/mach-imx/cpuidle.h
diff --git a/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c
index 85657610b4bf..c0245abdd955 100644
--- a/trunk/arch/arm/mach-imx/mach-imx6q.c
+++ b/trunk/arch/arm/mach-imx/mach-imx6q.c
@@ -33,10 +33,10 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/system_misc.h>
-#include <mach/cpuidle.h>
 #include <mach/hardware.h>
 
 #include "common.h"
+#include "cpuidle.h"
 
 void imx6q_restart(char mode, const char *cmd)
 {
diff --git a/trunk/arch/arm/mach-imx/pm-imx5.c b/trunk/arch/arm/mach-imx/pm-imx5.c
index 9fead8c4ea9d..a614702872f4 100644
--- a/trunk/arch/arm/mach-imx/pm-imx5.c
+++ b/trunk/arch/arm/mach-imx/pm-imx5.c
@@ -16,10 +16,10 @@
 #include <asm/cacheflush.h>
 #include <asm/system_misc.h>
 #include <asm/tlbflush.h>
-#include <mach/cpuidle.h>
 #include <mach/hardware.h>
 
 #include "common.h"
+#include "cpuidle.h"
 #include "crm-regs-imx5.h"
 
 /*