diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 14:27:01 -0800 |
| commit | a5bee307ba7befc96a97915d6d45ffbe1e5f9a20 (patch) | |
| tree | 544713c8b4359221df3677fb93a52892c57fbcee /arch/arm/mach-omap1/board-innovator.c | |
| parent | 0aac881246fb25d017617cd7be68e93326d51ce1 (diff) | |
| parent | acea7c7b81e8f67513aebade8cb99c7789c44d8c (diff) | |
Merge branch 'iomap' into cleanup
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 309369ea697..289a6b82c5f 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -26,7 +26,6 @@ #include <linux/input.h> #include <linux/smc91x.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -37,9 +36,13 @@ #include <plat/tc.h> #include <plat/usb.h> #include <plat/keypad.h> -#include "common.h" #include <plat/mmc.h> +#include <mach/hardware.h> + +#include "iomap.h" +#include "common.h" + /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ #define INNOVATOR1610_ETHR_START 0x04000300 |