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-clps711x/clep7312.c | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-clps711x/clep7312.c')
| -rw-r--r-- | arch/arm/mach-clps711x/clep7312.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c index c83f3fd68fcd..09fb57e45213 100644 --- a/arch/arm/mach-clps711x/clep7312.c +++ b/arch/arm/mach-clps711x/clep7312.c | |||
| @@ -38,7 +38,6 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, | |||
| 38 | 38 | ||
| 39 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") | 39 | MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") |
| 40 | /* Maintainer: Nobody */ | 40 | /* Maintainer: Nobody */ |
| 41 | .phys_ram = 0xc0000000, | ||
| 42 | .phys_io = 0x80000000, | 41 | .phys_io = 0x80000000, |
| 43 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, | 42 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, |
| 44 | .boot_params = 0xc0000100, | 43 | .boot_params = 0xc0000100, |