diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-omap2/board-omap3beagle.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3beagle.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index e085371eb494..3826493d1b2b 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
| @@ -552,7 +552,7 @@ static void __init omap3_beagle_init(void) | |||
| 552 | 552 | ||
| 553 | MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") | 553 | MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") |
| 554 | /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ | 554 | /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ |
| 555 | .boot_params = 0x80000100, | 555 | .atag_offset = 0x100, |
| 556 | .reserve = omap_reserve, | 556 | .reserve = omap_reserve, |
| 557 | .map_io = omap3_map_io, | 557 | .map_io = omap3_map_io, |
| 558 | .init_early = omap3_beagle_init_early, | 558 | .init_early = omap3_beagle_init_early, |