diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-12 06:08:12 -0500 |
| commit | 53640f41b97792b0889bb70f26f99c06743162a1 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/mach-imx/mach-imx6q.c | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6q.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 47c91f7185d2..978b6dd00de4 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/common.h> | ||
| 37 | #include <mach/cpuidle.h> | ||
| 38 | #include <mach/hardware.h> | ||
| 39 | 36 | ||
| 37 | #include "common.h" | ||
| 38 | #include "cpuidle.h" | ||
| 39 | #include "hardware.h" | ||
| 40 | 40 | ||
| 41 | void imx6q_restart(char mode, const char *cmd) | 41 | void imx6q_restart(char mode, const char *cmd) |
| 42 | { | 42 | { |