diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /include/asm-arm/arch-integrator/io.h | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
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) |