diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap2/board-omap3beagle.c | |
parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 08b0816afa61..76c727ed8da5 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -37,13 +37,13 @@ | |||
37 | #include <asm/mach/map.h> | 37 | #include <asm/mach/map.h> |
38 | #include <asm/mach/flash.h> | 38 | #include <asm/mach/flash.h> |
39 | 39 | ||
40 | #include <mach/board.h> | 40 | #include <plat/board.h> |
41 | #include <mach/common.h> | 41 | #include <plat/common.h> |
42 | #include <mach/gpmc.h> | 42 | #include <plat/gpmc.h> |
43 | #include <mach/nand.h> | 43 | #include <plat/nand.h> |
44 | #include <mach/mux.h> | 44 | #include <plat/mux.h> |
45 | #include <mach/usb.h> | 45 | #include <plat/usb.h> |
46 | #include <mach/timer-gp.h> | 46 | #include <plat/timer-gp.h> |
47 | 47 | ||
48 | #include "mmc-twl4030.h" | 48 | #include "mmc-twl4030.h" |
49 | 49 | ||
@@ -429,7 +429,7 @@ static void __init omap3_beagle_map_io(void) | |||
429 | MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | 429 | MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") |
430 | /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ | 430 | /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ |
431 | .phys_io = 0x48000000, | 431 | .phys_io = 0x48000000, |
432 | .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, | 432 | .io_pg_offst = ((0xfa000000) >> 18) & 0xfffc, |
433 | .boot_params = 0x80000100, | 433 | .boot_params = 0x80000100, |
434 | .map_io = omap3_beagle_map_io, | 434 | .map_io = omap3_beagle_map_io, |
435 | .init_irq = omap3_beagle_init_irq, | 435 | .init_irq = omap3_beagle_init_irq, |