summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-13 21:12:50 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:03:10 +0800
commite29248c9a7522cb50edd29f2a717be8f323cbeb3 (patch)
tree2ca7b5a5a4e32ca2d95e5155f0fb5d9ddac37d00 /arch/arm
parente3372474cfa0dc016f10ec47baddbd1ed0abecf3 (diff)
downloadblackbird-op-linux-e29248c9a7522cb50edd29f2a717be8f323cbeb3.tar.gz
blackbird-op-linux-e29248c9a7522cb50edd29f2a717be8f323cbeb3.zip
ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h
Rename mach-imx/include/mach/cpuidle.h to mach-imx/cpuidle.h, and update users to include cpuidle.h rather than mach/cpuidle.h. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-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.c2
-rw-r--r--arch/arm/mach-imx/pm-imx5.c2
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 @@
#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/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 @@
#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"
/*
OpenPOWER on IntegriCloud