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-omap2/board-2430sdp.c | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 42217b32f835..db9374bc528b 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
@@ -31,12 +31,12 @@ | |||
31 | #include <asm/mach/flash.h> | 31 | #include <asm/mach/flash.h> |
32 | 32 | ||
33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
34 | #include <mach/mux.h> | 34 | #include <plat/mux.h> |
35 | #include <mach/board.h> | 35 | #include <plat/board.h> |
36 | #include <mach/common.h> | 36 | #include <plat/common.h> |
37 | #include <mach/gpmc.h> | 37 | #include <plat/gpmc.h> |
38 | #include <mach/usb.h> | 38 | #include <plat/usb.h> |
39 | #include <mach/gpmc-smc91x.h> | 39 | #include <plat/gpmc-smc91x.h> |
40 | 40 | ||
41 | #include "mmc-twl4030.h" | 41 | #include "mmc-twl4030.h" |
42 | 42 | ||
@@ -221,7 +221,7 @@ static void __init omap_2430sdp_map_io(void) | |||
221 | MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") | 221 | MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") |
222 | /* Maintainer: Syed Khasim - Texas Instruments Inc */ | 222 | /* Maintainer: Syed Khasim - Texas Instruments Inc */ |
223 | .phys_io = 0x48000000, | 223 | .phys_io = 0x48000000, |
224 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 224 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
225 | .boot_params = 0x80000100, | 225 | .boot_params = 0x80000100, |
226 | .map_io = omap_2430sdp_map_io, | 226 | .map_io = omap_2430sdp_map_io, |
227 | .init_irq = omap_2430sdp_init_irq, | 227 | .init_irq = omap_2430sdp_init_irq, |