diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /arch/arm/mach-pxa/idp.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 c5a66bf4d3d5..386e107b53cc 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) | |||
| 181 | 181 | ||
| 182 | 182 | ||
| 183 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") | 183 | MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") |
| 184 | MAINTAINER("Vibren Technologies") | 184 | /* Maintainer: Vibren Technologies */ |
| 185 | BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) | 185 | .phys_ram = 0xa0000000, |
| 186 | MAPIO(idp_map_io) | 186 | .phys_io = 0x40000000, |
| 187 | INITIRQ(idp_init_irq) | 187 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 188 | .map_io = idp_map_io, | ||
| 189 | .init_irq = idp_init_irq, | ||
| 188 | .timer = &pxa_timer, | 190 | .timer = &pxa_timer, |
| 189 | INIT_MACHINE(idp_init) | 191 | .init_machine = idp_init, |
| 190 | MACHINE_END | 192 | MACHINE_END |