diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-10 18:10:34 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 18:10:34 -0800 |
commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /arch/arm/mach-omap2/board-zoom2.c | |
parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
download | op-kernel-dev-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip op-kernel-dev-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.gz |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom2.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index ea00486..4ad9b94 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -21,8 +21,8 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <mach/common.h> -#include <mach/usb.h> +#include <plat/common.h> +#include <plat/usb.h> #include "mmc-twl4030.h" #include "sdram-micron-mt46h32m32lf-6.h" @@ -283,7 +283,7 @@ static void __init omap_zoom2_map_io(void) MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = omap_zoom2_map_io, .init_irq = omap_zoom2_init_irq, |