diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 09:46:09 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:03:11 -0400 |
commit | 39ef6340c702ea734ef5a9a38858e96e05b4b5cc (patch) | |
tree | f69eb463507547a80a97cfc2aa782b9842a6f591 /arch/arm/mach-imx/mach-armadillo5x0.c | |
parent | c045e3f137362fa34b337cdca66d3f6000a3b094 (diff) |
ARM: imx: include ulpi.h rather than mach/ulpi.h
Rename mach-imx/include/mach/ulpi.h to mach-imx/ulpi.h, and update
users to include ulpi.h rather than mach/ulpi.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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index d05b63fbeef1..afa991b7d66b 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -48,12 +48,11 @@ | |||
48 | #include <asm/memory.h> | 48 | #include <asm/memory.h> |
49 | #include <asm/mach/map.h> | 49 | #include <asm/mach/map.h> |
50 | 50 | ||
51 | #include <mach/ulpi.h> | ||
52 | |||
53 | #include "common.h" | 51 | #include "common.h" |
54 | #include "devices-imx31.h" | 52 | #include "devices-imx31.h" |
55 | #include "crmregs-imx3.h" | 53 | #include "crmregs-imx3.h" |
56 | #include "iomux-mx3.h" | 54 | #include "iomux-mx3.h" |
55 | #include "ulpi.h" | ||
57 | 56 | ||
58 | static int armadillo5x0_pins[] = { | 57 | static int armadillo5x0_pins[] = { |
59 | /* UART1 */ | 58 | /* UART1 */ |