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-2430sdp.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-2430sdp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 45dafe2e8552..bb5452eb842d 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c | |||
| @@ -245,7 +245,7 @@ static void __init omap_2430sdp_init(void) | |||
| 245 | 245 | ||
| 246 | MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") | 246 | MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board") |
| 247 | /* Maintainer: Syed Khasim - Texas Instruments Inc */ | 247 | /* Maintainer: Syed Khasim - Texas Instruments Inc */ |
| 248 | .boot_params = 0x80000100, | 248 | .atag_offset = 0x100, |
| 249 | .reserve = omap_reserve, | 249 | .reserve = omap_reserve, |
| 250 | .map_io = omap243x_map_io, | 250 | .map_io = omap243x_map_io, |
| 251 | .init_early = omap2430_init_early, | 251 | .init_early = omap2430_init_early, |