diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:08:10 -0400 |
| commit | 08cab72f91c8b28ffabfd143119bccdd4a115ad7 (patch) | |
| tree | ccd5583971caecd82bf2d1e62691bf6e0362d650 /arch/arm/mach-omap1/board-palmz71.c | |
| parent | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into next/dt
Conflicts:
arch/arm/include/asm/localtimer.h
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-omap2/board-generic.c
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 9b0ea48d35f..98e79bc0921 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
| @@ -341,7 +341,7 @@ omap_palmz71_map_io(void) | |||
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") | 343 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") |
| 344 | .boot_params = 0x10000100, | 344 | .atag_offset = 0x100, |
| 345 | .map_io = omap_palmz71_map_io, | 345 | .map_io = omap_palmz71_map_io, |
| 346 | .reserve = omap_reserve, | 346 | .reserve = omap_reserve, |
| 347 | .init_irq = omap_palmz71_init_irq, | 347 | .init_irq = omap_palmz71_init_irq, |