diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-14 14:14:45 +0800 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 10:05:43 +0800 |
commit | 50f2de61269bbe2f40bead1969a9594fa8599b93 (patch) | |
tree | 842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/clk-imx31.c | |
parent | 6dde5ac5220b3b9c28f82f291b64eca3e5ebe80d (diff) | |
download | blackbird-op-linux-50f2de61269bbe2f40bead1969a9594fa8599b93.tar.gz blackbird-op-linux-50f2de61269bbe2f40bead1969a9594fa8599b93.zip |
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-imx31.c')
-rw-r--r-- | arch/arm/mach-imx/clk-imx31.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c index 1277f732d1f9..8be64e0a4ace 100644 --- a/arch/arm/mach-imx/clk-imx31.c +++ b/arch/arm/mach-imx/clk-imx31.c @@ -22,12 +22,11 @@ #include <linux/err.h> #include <linux/of.h> -#include <mach/hardware.h> -#include <mach/mx31.h> - #include "clk.h" #include "common.h" #include "crmregs-imx3.h" +#include "hardware.h" +#include "mx31.h" static const char *mcu_main_sel[] = { "spll", "mpll", }; static const char *per_sel[] = { "per_div", "ipg", }; |