diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
| commit | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch) | |
| tree | de5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /arch/arm/mach-omap/board-osk.c | |
| parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
| parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) | |
| download | linux-rt-19f7241a3b087bbf4dd107c979608fdb56c83a09.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap/board-osk.c')
| -rw-r--r-- | arch/arm/mach-omap/board-osk.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-omap/board-osk.c b/arch/arm/mach-omap/board-osk.c index a951fc82459b..cb433436aa08 100644 --- a/arch/arm/mach-omap/board-osk.c +++ b/arch/arm/mach-omap/board-osk.c @@ -159,11 +159,13 @@ static void __init osk_map_io(void) } MACHINE_START(OMAP_OSK, "TI-OSK") - MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>") - BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) - BOOT_PARAMS(0x10000100) - MAPIO(osk_map_io) - INITIRQ(osk_init_irq) - INIT_MACHINE(osk_init) + /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */ + .phys_ram = 0x10000000, + .phys_io = 0xfff00000, + .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, + .boot_params = 0x10000100, + .map_io = osk_map_io, + .init_irq = osk_init_irq, + .init_machine = osk_init, .timer = &omap_timer, MACHINE_END |