From patchwork Thu Sep 20 06:45:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2, 07/34] ARM: imx: ARM: imx: include cpuidle.h rather than mach/cpuidle.h X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 185322 Message-Id: <1348123547-31082-8-git-send-email-shawn.guo@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: Sascha Hauer , Shawn Guo , Arnd Bergmann , Javier Martin , Rob Herring Date: Thu, 20 Sep 2012 14:45:20 +0800 From: Shawn Guo List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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 Acked-by: Sascha Hauer Acked-by: Arnd Bergmann --- arch/arm/mach-imx/{include/mach => }/cpuidle.h | 0 arch/arm/mach-imx/mach-imx6q.c | 2 +- arch/arm/mach-imx/pm-imx5.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-imx/{include/mach => }/cpuidle.h (100%) diff --git a/arch/arm/mach-imx/include/mach/cpuidle.h b/arch/arm/mach-imx/cpuidle.h similarity index 100% rename from arch/arm/mach-imx/include/mach/cpuidle.h rename to 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 455673e..33ddb49 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -32,10 +32,10 @@ #include #include #include -#include #include #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 9fead8c..a614702 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -16,10 +16,10 @@ #include #include #include -#include #include #include "common.h" +#include "cpuidle.h" #include "crm-regs-imx5.h" /*