diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/arm/mach-pxa/mainstone.c | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
| -rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 02e188d98e7d..b307f11951df 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
| @@ -493,6 +493,7 @@ static void __init mainstone_map_io(void) | |||
| 493 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") | 493 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") |
| 494 | /* Maintainer: MontaVista Software Inc. */ | 494 | /* Maintainer: MontaVista Software Inc. */ |
| 495 | .phys_io = 0x40000000, | 495 | .phys_io = 0x40000000, |
| 496 | .boot_params = 0xa0000100, /* BLOB boot parameter setting */ | ||
| 496 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 497 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
| 497 | .map_io = mainstone_map_io, | 498 | .map_io = mainstone_map_io, |
| 498 | .init_irq = mainstone_init_irq, | 499 | .init_irq = mainstone_init_irq, |