diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-07-04 14:14:42 +0100 |
commit | 07929dcb963786512c760dd3ecd148d89295e7e5 (patch) | |
tree | f5db01392ebb968b4c8acb5a6b3b03a833bfcb02 /arch/arm/mach-omap/board-osk.c | |
parent | Automerge with /usr/src/ntfs-2.6.git. (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
download | linux-dev-07929dcb963786512c760dd3ecd148d89295e7e5.tar.xz linux-dev-07929dcb963786512c760dd3ecd148d89295e7e5.zip |
Automatic merge with /usr/src/ntfs-2.6.git.
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 |