diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 09:14:42 -0400 |
| commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
| tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /arch/arm/mach-omap/board-innovator.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm/mach-omap/board-innovator.c')
| -rw-r--r-- | arch/arm/mach-omap/board-innovator.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-omap/board-innovator.c b/arch/arm/mach-omap/board-innovator.c index 57cf4da88d55..523363f18cc0 100644 --- a/arch/arm/mach-omap/board-innovator.c +++ b/arch/arm/mach-omap/board-innovator.c | |||
| @@ -270,11 +270,13 @@ static void __init innovator_map_io(void) | |||
| 270 | } | 270 | } |
| 271 | 271 | ||
| 272 | MACHINE_START(OMAP_INNOVATOR, "TI-Innovator") | 272 | MACHINE_START(OMAP_INNOVATOR, "TI-Innovator") |
| 273 | MAINTAINER("MontaVista Software, Inc.") | 273 | /* Maintainer: MontaVista Software, Inc. */ |
| 274 | BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) | 274 | .phys_ram = 0x10000000, |
| 275 | BOOT_PARAMS(0x10000100) | 275 | .phys_io = 0xfff00000, |
| 276 | MAPIO(innovator_map_io) | 276 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 277 | INITIRQ(innovator_init_irq) | 277 | .boot_params = 0x10000100, |
| 278 | INIT_MACHINE(innovator_init) | 278 | .map_io = innovator_map_io, |
| 279 | .init_irq = innovator_init_irq, | ||
| 280 | .init_machine = innovator_init, | ||
| 279 | .timer = &omap_timer, | 281 | .timer = &omap_timer, |
| 280 | MACHINE_END | 282 | MACHINE_END |