diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-clps711x/autcpu12.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-clps711x/autcpu12.c')
| -rw-r--r-- | arch/arm/mach-clps711x/autcpu12.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index dc73feb1ffb0..43b9423d1440 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c | |||
| @@ -46,10 +46,14 @@ | |||
| 46 | */ | 46 | */ |
| 47 | 47 | ||
| 48 | static struct map_desc autcpu12_io_desc[] __initdata = { | 48 | static struct map_desc autcpu12_io_desc[] __initdata = { |
| 49 | /* virtual, physical, length, type */ | 49 | /* memory-mapped extra io and CS8900A Ethernet chip */ |
| 50 | /* memory-mapped extra io and CS8900A Ethernet chip */ | 50 | /* ethernet chip */ |
| 51 | /* ethernet chip */ | 51 | { |
| 52 | { AUTCPU12_VIRT_CS8900A, AUTCPU12_PHYS_CS8900A, SZ_1M, MT_DEVICE } | 52 | .virtual = AUTCPU12_VIRT_CS8900A, |
| 53 | .pfn = __phys_to_pfn(AUTCPU12_PHYS_CS8900A), | ||
| 54 | .length = SZ_1M, | ||
| 55 | .type = MT_DEVICE | ||
| 56 | } | ||
| 53 | }; | 57 | }; |
| 54 | 58 | ||
| 55 | void __init autcpu12_map_io(void) | 59 | void __init autcpu12_map_io(void) |