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-omap1/board-h2.c | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index a07e2c9307fa..9533c36a92df 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
| @@ -199,7 +199,6 @@ static void __init h2_map_io(void) | |||
| 199 | 199 | ||
| 200 | MACHINE_START(OMAP_H2, "TI-H2") | 200 | MACHINE_START(OMAP_H2, "TI-H2") |
| 201 | /* Maintainer: Imre Deak <imre.deak@nokia.com> */ | 201 | /* Maintainer: Imre Deak <imre.deak@nokia.com> */ |
| 202 | .phys_ram = 0x10000000, | ||
| 203 | .phys_io = 0xfff00000, | 202 | .phys_io = 0xfff00000, |
| 204 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 203 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
| 205 | .boot_params = 0x10000100, | 204 | .boot_params = 0x10000100, |