diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap1/board-innovator.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index cd6c39514826..cf0fdb9c182f 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
| @@ -30,14 +30,14 @@ | |||
| 30 | #include <asm/mach/flash.h> | 30 | #include <asm/mach/flash.h> |
| 31 | #include <asm/mach/map.h> | 31 | #include <asm/mach/map.h> |
| 32 | 32 | ||
| 33 | #include <mach/mux.h> | 33 | #include <plat/mux.h> |
| 34 | #include <mach/fpga.h> | 34 | #include <plat/fpga.h> |
| 35 | #include <mach/gpio.h> | 35 | #include <mach/gpio.h> |
| 36 | #include <mach/tc.h> | 36 | #include <plat/tc.h> |
| 37 | #include <mach/usb.h> | 37 | #include <plat/usb.h> |
| 38 | #include <mach/keypad.h> | 38 | #include <plat/keypad.h> |
| 39 | #include <mach/common.h> | 39 | #include <plat/common.h> |
| 40 | #include <mach/mmc.h> | 40 | #include <plat/mmc.h> |
| 41 | 41 | ||
| 42 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ | 42 | /* At OMAP1610 Innovator the Ethernet is directly connected to CS1 */ |
| 43 | #define INNOVATOR1610_ETHR_START 0x04000300 | 43 | #define INNOVATOR1610_ETHR_START 0x04000300 |