diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-11 02:10:34 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 02:10:34 (GMT) |
commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap2/board-3430sdp.c | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
download | linux-fsl-qoriq-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-3430sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3430sdp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c index 0acb556..a2abac9 100644 --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@ -30,16 +30,16 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mcspi.h> -#include <mach/mux.h> -#include <mach/board.h> -#include <mach/usb.h> -#include <mach/common.h> -#include <mach/dma.h> -#include <mach/gpmc.h> +#include <plat/mcspi.h> +#include <plat/mux.h> +#include <plat/board.h> +#include <plat/usb.h> +#include <plat/common.h> +#include <plat/dma.h> +#include <plat/gpmc.h> -#include <mach/control.h> -#include <mach/gpmc-smc91x.h> +#include <plat/control.h> +#include <plat/gpmc-smc91x.h> #include "sdram-qimonda-hyb18m512160af-6.h" #include "mmc-twl4030.h" @@ -511,7 +511,7 @@ static void __init omap_3430sdp_map_io(void) MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board") /* Maintainer: Syed Khasim - Texas Instruments Inc */ .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap_3430sdp_map_io, .init_irq = omap_3430sdp_init_irq, |