diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
| commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
| tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/arm/mach-omap/board-innovator.c | |
| parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
Merge ../linux-2.6/
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 |