diff options
Diffstat (limited to 'arch/arm/mach-imx/mach-armadillo5x0.c')
-rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index 5985ed1b8c98..59bd6b06a6b5 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -41,19 +41,18 @@ | |||
41 | #include <linux/regulator/machine.h> | 41 | #include <linux/regulator/machine.h> |
42 | #include <linux/regulator/fixed.h> | 42 | #include <linux/regulator/fixed.h> |
43 | 43 | ||
44 | #include <mach/hardware.h> | ||
45 | #include <asm/mach-types.h> | 44 | #include <asm/mach-types.h> |
46 | #include <asm/mach/arch.h> | 45 | #include <asm/mach/arch.h> |
47 | #include <asm/mach/time.h> | 46 | #include <asm/mach/time.h> |
48 | #include <asm/memory.h> | 47 | #include <asm/memory.h> |
49 | #include <asm/mach/map.h> | 48 | #include <asm/mach/map.h> |
50 | 49 | ||
51 | #include <mach/common.h> | 50 | #include "common.h" |
52 | #include <mach/iomux-mx3.h> | ||
53 | #include <mach/ulpi.h> | ||
54 | |||
55 | #include "devices-imx31.h" | 51 | #include "devices-imx31.h" |
56 | #include "crmregs-imx3.h" | 52 | #include "crmregs-imx3.h" |
53 | #include "hardware.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 */ |