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-rx51.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-rx51.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 78869a9..f1e7e5b 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -22,13 +22,13 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <mach/mcspi.h> -#include <mach/mux.h> -#include <mach/board.h> -#include <mach/common.h> -#include <mach/dma.h> -#include <mach/gpmc.h> -#include <mach/usb.h> +#include <plat/mcspi.h> +#include <plat/mux.h> +#include <plat/board.h> +#include <plat/common.h> +#include <plat/dma.h> +#include <plat/gpmc.h> +#include <plat/usb.h> static struct omap_lcd_config rx51_lcd_config = { .ctrl_name = "internal", @@ -84,7 +84,7 @@ static void __init rx51_map_io(void) MACHINE_START(NOKIA_RX51, "Nokia RX-51 board") /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */ .phys_io = 0x48000000, - .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, + .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, .boot_params = 0x80000100, .map_io = rx51_map_io, .init_irq = rx51_init_irq, |