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-pxa/idp.c | |
| parent | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (diff) | |
| parent | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (diff) | |
| download | kernel_goldelico_gta04-07929dcb963786512c760dd3ecd148d89295e7e5.zip kernel_goldelico_gta04-07929dcb963786512c760dd3ecd148d89295e7e5.tar.gz kernel_goldelico_gta04-07929dcb963786512c760dd3ecd148d89295e7e5.tar.bz2 | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/arm/mach-pxa/idp.c')
| -rw-r--r-- | arch/arm/mach-pxa/idp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index c5a66bf..f82f5aa 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c @@ -181,10 +181,12 @@ static void __init idp_map_io(void) MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") - MAINTAINER("Vibren Technologies") - BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) - MAPIO(idp_map_io) - INITIRQ(idp_init_irq) + /* Maintainer: Vibren Technologies */ + .phys_ram = 0xa0000000, + .phys_io = 0x40000000, + .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,) + .map_io = idp_map_io, + .init_irq = idp_init_irq, .timer = &pxa_timer, - INIT_MACHINE(idp_init) + .init_machine = idp_init, MACHINE_END |