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-omap4panda.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index e26929049a4d..2141894eb9f3 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
| @@ -572,7 +572,7 @@ static void __init omap4_panda_init(void) | |||
| 572 | 572 | ||
| 573 | MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") | 573 | MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") |
| 574 | /* Maintainer: David Anders - Texas Instruments Inc */ | 574 | /* Maintainer: David Anders - Texas Instruments Inc */ |
| 575 | .boot_params = 0x80000100, | 575 | .atag_offset = 0x100, |
| 576 | .reserve = omap_reserve, | 576 | .reserve = omap_reserve, |
| 577 | .map_io = omap4_map_io, | 577 | .map_io = omap4_map_io, |
| 578 | .init_early = omap4430_init_early, | 578 | .init_early = omap4430_init_early, |