diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
| commit | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (patch) | |
| tree | b9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df /arch/arm/mach-sa1100/h3600.c | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index e8352b7f74b0..b04d92271020 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
| @@ -392,7 +392,6 @@ static void __init h3100_map_io(void) | |||
| 392 | } | 392 | } |
| 393 | 393 | ||
| 394 | MACHINE_START(H3100, "Compaq iPAQ H3100") | 394 | MACHINE_START(H3100, "Compaq iPAQ H3100") |
| 395 | .phys_ram = 0xc0000000, | ||
| 396 | .phys_io = 0x80000000, | 395 | .phys_io = 0x80000000, |
| 397 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, | 396 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 398 | .boot_params = 0xc0000100, | 397 | .boot_params = 0xc0000100, |
| @@ -510,7 +509,6 @@ static void __init h3600_map_io(void) | |||
| 510 | } | 509 | } |
| 511 | 510 | ||
| 512 | MACHINE_START(H3600, "Compaq iPAQ H3600") | 511 | MACHINE_START(H3600, "Compaq iPAQ H3600") |
| 513 | .phys_ram = 0xc0000000, | ||
| 514 | .phys_io = 0x80000000, | 512 | .phys_io = 0x80000000, |
| 515 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, | 513 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 516 | .boot_params = 0xc0000100, | 514 | .boot_params = 0xc0000100, |
| @@ -897,7 +895,6 @@ static void __init h3800_map_io(void) | |||
| 897 | } | 895 | } |
| 898 | 896 | ||
| 899 | MACHINE_START(H3800, "Compaq iPAQ H3800") | 897 | MACHINE_START(H3800, "Compaq iPAQ H3800") |
| 900 | .phys_ram = 0xc0000000, | ||
| 901 | .phys_io = 0x80000000, | 898 | .phys_io = 0x80000000, |
| 902 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, | 899 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 903 | .boot_params = 0xc0000100, | 900 | .boot_params = 0xc0000100, |