diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-imx/cpuidle.h (renamed from arch/arm/mach-imx/include/mach/cpuidle.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/pm-imx5.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/include/mach/cpuidle.h b/arch/arm/mach-imx/cpuidle.h index bc932d1af372..bc932d1af372 100644 --- a/arch/arm/mach-imx/include/mach/cpuidle.h +++ b/arch/arm/mach-imx/cpuidle.h | |||
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 85657610b4bf..c0245abdd955 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c | |||
@@ -33,10 +33,10 @@ | |||
33 | #include <asm/mach/arch.h> | 33 | #include <asm/mach/arch.h> |
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | #include <asm/system_misc.h> | 35 | #include <asm/system_misc.h> |
36 | #include <mach/cpuidle.h> | ||
37 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
38 | 37 | ||
39 | #include "common.h" | 38 | #include "common.h" |
39 | #include "cpuidle.h" | ||
40 | 40 | ||
41 | void imx6q_restart(char mode, const char *cmd) | 41 | void imx6q_restart(char mode, const char *cmd) |
42 | { | 42 | { |
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c index 9fead8c4ea9d..a614702872f4 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <asm/cacheflush.h> | 16 | #include <asm/cacheflush.h> |
17 | #include <asm/system_misc.h> | 17 | #include <asm/system_misc.h> |
18 | #include <asm/tlbflush.h> | 18 | #include <asm/tlbflush.h> |
19 | #include <mach/cpuidle.h> | ||
20 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
21 | 20 | ||
22 | #include "common.h" | 21 | #include "common.h" |
22 | #include "cpuidle.h" | ||
23 | #include "crm-regs-imx5.h" | 23 | #include "crm-regs-imx5.h" |
24 | 24 | ||
25 | /* | 25 | /* |