diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 10:21:27 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 10:21:27 -0500 |
| commit | 89a4150331bc07014256714678ce8e9b238fc145 (patch) | |
| tree | 3a0358208775f29f9e319b506ce849c5dbdc1a06 /arch/arm/mach-imx/mach-mx31lilly.c | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| parent | 68b25325a7fd290b5e472bba0df9cbe8c1a81d8f (diff) | |
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into x
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 34b9bf075daf..08b9965c8b36 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c | |||
| @@ -42,13 +42,12 @@ | |||
| 42 | #include <asm/mach/time.h> | 42 | #include <asm/mach/time.h> |
| 43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
| 44 | 44 | ||
| 45 | #include <mach/hardware.h> | 45 | #include "board-mx31lilly.h" |
| 46 | #include <mach/common.h> | 46 | #include "common.h" |
| 47 | #include <mach/iomux-mx3.h> | ||
| 48 | #include <mach/board-mx31lilly.h> | ||
| 49 | #include <mach/ulpi.h> | ||
| 50 | |||
| 51 | #include "devices-imx31.h" | 47 | #include "devices-imx31.h" |
| 48 | #include "hardware.h" | ||
| 49 | #include "iomux-mx3.h" | ||
| 50 | #include "ulpi.h" | ||
| 52 | 51 | ||
| 53 | /* | 52 | /* |
| 54 | * This file contains module-specific initialization routines for LILLY-1131. | 53 | * This file contains module-specific initialization routines for LILLY-1131. |