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-netstar.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm/mach-omap/board-netstar.c')
| -rw-r--r-- | arch/arm/mach-omap/board-netstar.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-omap/board-netstar.c b/arch/arm/mach-omap/board-netstar.c index 54acbd215c4b..8c653734d5a3 100644 --- a/arch/arm/mach-omap/board-netstar.c +++ b/arch/arm/mach-omap/board-netstar.c | |||
| @@ -141,11 +141,13 @@ static int __init netstar_late_init(void) | |||
| 141 | postcore_initcall(netstar_late_init); | 141 | postcore_initcall(netstar_late_init); |
| 142 | 142 | ||
| 143 | MACHINE_START(NETSTAR, "NetStar OMAP5910") | 143 | MACHINE_START(NETSTAR, "NetStar OMAP5910") |
| 144 | MAINTAINER("Ladislav Michl <michl@2n.cz>") | 144 | /* Maintainer: Ladislav Michl <michl@2n.cz> */ |
| 145 | BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) | 145 | .phys_ram = 0x10000000, |
| 146 | BOOT_PARAMS(0x10000100) | 146 | .phys_io = 0xfff00000, |
| 147 | MAPIO(netstar_map_io) | 147 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 148 | INITIRQ(netstar_init_irq) | 148 | .boot_params = 0x10000100, |
| 149 | INIT_MACHINE(netstar_init) | 149 | .map_io = netstar_map_io, |
| 150 | .timer = &omap_timer, | 150 | .init_irq = netstar_init_irq, |
| 151 | .init_machine = netstar_init, | ||
| 152 | .timer = &omap_timer, | ||
| 151 | MACHINE_END | 153 | MACHINE_END |