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-omap3stalker.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index fa58a0f1584a..170e1ebd6e62 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
| @@ -484,7 +484,7 @@ static void __init omap3_stalker_init(void) | |||
| 484 | 484 | ||
| 485 | MACHINE_START(SBC3530, "OMAP3 STALKER") | 485 | MACHINE_START(SBC3530, "OMAP3 STALKER") |
| 486 | /* Maintainer: Jason Lam -lzg@ema-tech.com */ | 486 | /* Maintainer: Jason Lam -lzg@ema-tech.com */ |
| 487 | .boot_params = 0x80000100, | 487 | .atag_offset = 0x100, |
| 488 | .map_io = omap3_map_io, | 488 | .map_io = omap3_map_io, |
| 489 | .init_early = omap35xx_init_early, | 489 | .init_early = omap35xx_init_early, |
| 490 | .init_irq = omap3_init_irq, | 490 | .init_irq = omap3_init_irq, |