diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
| commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
| tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-omap1/board-palmz71.c | |
| parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
| parent | 869fef41547db95df8523bf67845a21313709428 (diff) | |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-palmz71.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index f431b44a71e3..66362903b6e2 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c | |||
| @@ -338,10 +338,12 @@ omap_palmz71_map_io(void) | |||
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") | 340 | MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71") |
| 341 | .phys_io = 0xfff00000, | 341 | .phys_io = 0xfff00000, |
| 342 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 342 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 343 | .boot_params = 0x10000100,.map_io = omap_palmz71_map_io, | 343 | .boot_params = 0x10000100, |
| 344 | .init_irq = omap_palmz71_init_irq, | 344 | .map_io = omap_palmz71_map_io, |
| 345 | .init_machine = omap_palmz71_init, | 345 | .reserve = omap_reserve, |
| 346 | .timer = &omap_timer, | 346 | .init_irq = omap_palmz71_init_irq, |
| 347 | .init_machine = omap_palmz71_init, | ||
| 348 | .timer = &omap_timer, | ||
| 347 | MACHINE_END | 349 | MACHINE_END |