lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel-map-io' into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-08-04 14:43:45 +03:00
parent 7e788b4289 869fef4154
commit 7590d1defd
514 changed files with 18478 additions and 6618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-omap2/board-omap3beagle.c
View File

@@ -485,18 +485,13 @@ static void __init omap3_beagle_init(void)
beagle_display_init();
}
static void __init omap3_beagle_map_io(void)
{
omap2_set_globals_343x();
omap34xx_map_common_io();
}
MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
/* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap3_beagle_map_io,
.map_io = omap3_map_io,
.reserve = omap_reserve,
.init_irq = omap3_beagle_init_irq,
.init_machine = omap3_beagle_init,
.timer = &omap_timer,