diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-14 08:14:45 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 04:05:43 +0200 |
| commit | 50f2de61269bbe2f40bead1969a9594fa8599b93 (patch) | |
| tree | 842f17cd25c5350f602a3fb31960e34bb3855b21 /arch/arm/mach-imx/mach-armadillo5x0.c | |
| parent | ARM: imx: move debug macros to include/debug (diff) | |
| download | linux-50f2de61269bbe2f40bead1969a9594fa8599b93.tar.xz 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/mach-armadillo5x0.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index afa991b7d66b..59bd6b06a6b5 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c @@ -41,7 +41,6 @@ #include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> @@ -51,6 +50,7 @@ #include "common.h" #include "devices-imx31.h" #include "crmregs-imx3.h" +#include "hardware.h" #include "iomux-mx3.h" #include "ulpi.h" |