summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx25.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-14 14:14:45 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:05:43 +0800
commit50f2de61269bbe2f40bead1969a9594fa8599b93 (patch)
tree842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/clk-imx25.c
parent6dde5ac5220b3b9c28f82f291b64eca3e5ebe80d (diff)
downloadop-kernel-dev-50f2de61269bbe2f40bead1969a9594fa8599b93.zip
op-kernel-dev-50f2de61269bbe2f40bead1969a9594fa8599b93.tar.gz
ARM: imx: include hardware.h rather than mach/hardware.h
It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardware.h rather than mach/hardware.h. The files in mach-imx/devices will need to include "../hardware.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/mach-imx/clk-imx25.c')
-rw-r--r--arch/arm/mach-imx/clk-imx25.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx25.c b/arch/arm/mach-imx/clk-imx25.c
index 08d9803..fd8b27f 100644
--- a/arch/arm/mach-imx/clk-imx25.c
+++ b/arch/arm/mach-imx/clk-imx25.c
@@ -24,11 +24,10 @@
#include <linux/clkdev.h>
#include <linux/err.h>
-#include <mach/hardware.h>
-#include <mach/mx25.h>
-
#include "clk.h"
#include "common.h"
+#include "hardware.h"
+#include "mx25.h"
#define CRM_BASE MX25_IO_ADDRESS(MX25_CRM_BASE_ADDR)
OpenPOWER on IntegriCloud