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-sa1100/cerf.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-sa1100/cerf.c')
| -rw-r--r-- | arch/arm/mach-sa1100/cerf.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index 9484be7dc671..23cb74885275 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c | |||
| @@ -100,8 +100,12 @@ static void __init cerf_init_irq(void) | |||
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | static struct map_desc cerf_io_desc[] __initdata = { | 102 | static struct map_desc cerf_io_desc[] __initdata = { |
| 103 | /* virtual physical length type */ | 103 | { /* Crystal Ethernet Chip */ |
| 104 | { 0xf0000000, 0x08000000, 0x00100000, MT_DEVICE } /* Crystal Ethernet Chip */ | 104 | .virtual = 0xf0000000, |
| 105 | .pfn = __phys_to_pfn(0x08000000), | ||
| 106 | .length = 0x00100000, | ||
| 107 | .type = MT_DEVICE | ||
| 108 | } | ||
| 105 | }; | 109 | }; |
| 106 | 110 | ||
| 107 | static void __init cerf_map_io(void) | 111 | static void __init cerf_map_io(void) |