diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /arch/arm/mach-iop3xx/iq31244-mm.c | |
| parent | 9be16a03928642f944915b8c05945fd87b7a15cb (diff) | |
| parent | 50f4c001bc1534db77663592496204ceba151e97 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
Diffstat (limited to 'arch/arm/mach-iop3xx/iq31244-mm.c')
| -rw-r--r-- | arch/arm/mach-iop3xx/iq31244-mm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-iop3xx/iq31244-mm.c b/arch/arm/mach-iop3xx/iq31244-mm.c index 55992ab586ba..e874b54eefe3 100644 --- a/arch/arm/mach-iop3xx/iq31244-mm.c +++ b/arch/arm/mach-iop3xx/iq31244-mm.c | |||
| @@ -29,10 +29,12 @@ | |||
| 29 | * We use RedBoot's setup for the onboard devices. | 29 | * We use RedBoot's setup for the onboard devices. |
| 30 | */ | 30 | */ |
| 31 | static struct map_desc iq31244_io_desc[] __initdata = { | 31 | static struct map_desc iq31244_io_desc[] __initdata = { |
| 32 | /* virtual physical length type */ | 32 | { /* on-board devices */ |
| 33 | 33 | .virtual = IQ31244_UART, | |
| 34 | /* on-board devices */ | 34 | .pfn = __phys_to_pfn(IQ31244_UART), |
| 35 | { IQ31244_UART, IQ31244_UART, 0x00100000, MT_DEVICE } | 35 | .length = 0x00100000, |
| 36 | .type = MT_DEVICE | ||
| 37 | } | ||
| 36 | }; | 38 | }; |
| 37 | 39 | ||
| 38 | void __init iq31244_map_io(void) | 40 | void __init iq31244_map_io(void) |