diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-14 02:14:45 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:05:43 -0400 |
| commit | 50f2de61269bbe2f40bead1969a9594fa8599b93 (patch) | |
| tree | 842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/clk-imx1.c | |
| parent | 6dde5ac5220b3b9c28f82f291b64eca3e5ebe80d (diff) | |
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-imx1.c')
| -rw-r--r-- | arch/arm/mach-imx/clk-imx1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c index 796d8b86e8b6..15f9d223cf0b 100644 --- a/arch/arm/mach-imx/clk-imx1.c +++ b/arch/arm/mach-imx/clk-imx1.c | |||
| @@ -22,10 +22,9 @@ | |||
| 22 | #include <linux/clkdev.h> | 22 | #include <linux/clkdev.h> |
| 23 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 24 | 24 | ||
| 25 | #include <mach/hardware.h> | ||
| 26 | |||
| 27 | #include "clk.h" | 25 | #include "clk.h" |
| 28 | #include "common.h" | 26 | #include "common.h" |
| 27 | #include "hardware.h" | ||
| 29 | 28 | ||
| 30 | /* CCM register addresses */ | 29 | /* CCM register addresses */ |
| 31 | #define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off))) | 30 | #define IO_ADDR_CCM(off) (MX1_IO_ADDRESS(MX1_CCM_BASE_ADDR + (off))) |