---

yaml --- r: 339737 b: refs/heads/master c: e29248c h: refs/heads/master i: 339735: 3cd2441 v: v3
git-mirror · Oct 15, 2012 · 563f95a · 563f95a
1 parent 1bd6ae0
commit 563f95a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3372474cfa0dc016f10ec47baddbd1ed0abecf3
+refs/heads/master: e29248c9a7522cb50edd29f2a717be8f323cbeb3
diff --git a/.../arch/arm/mach-imx/include/mach/cpuidle.h → trunk/arch/arm/mach-imx/cpuidle.h b/.../arch/arm/mach-imx/include/mach/cpuidle.h → 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
@@ -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
@@ -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"
 
 /*