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 /include/asm-arm/arch-integrator/io.h | |
| 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 'include/asm-arm/arch-integrator/io.h')
| -rw-r--r-- | include/asm-arm/arch-integrator/io.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h index fbea8be67d26..31f2deab51b0 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/include/asm-arm/arch-integrator/io.h | |||
| @@ -22,6 +22,14 @@ | |||
| 22 | 22 | ||
| 23 | #define IO_SPACE_LIMIT 0xffff | 23 | #define IO_SPACE_LIMIT 0xffff |
| 24 | 24 | ||
| 25 | /* | ||
| 26 | * WARNING: this has to mirror definitions in platform.h | ||
| 27 | */ | ||
| 28 | #define PCI_MEMORY_VADDR 0xe8000000 | ||
| 29 | #define PCI_CONFIG_VADDR 0xec000000 | ||
| 30 | #define PCI_V3_VADDR 0xed000000 | ||
| 31 | #define PCI_IO_VADDR 0xee000000 | ||
| 32 | |||
| 25 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) | 33 | #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) |
| 26 | #define __mem_pci(a) (a) | 34 | #define __mem_pci(a) (a) |
| 27 | #define __mem_isa(a) ((a) + PCI_MEMORY_VADDR) | 35 | #define __mem_isa(a) ((a) + PCI_MEMORY_VADDR) |