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/hardware.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/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-integrator/hardware.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-arm/arch-integrator/hardware.h b/include/asm-arm/arch-integrator/hardware.h index be2716eeaa02..6f0947bc500d 100644 --- a/include/asm-arm/arch-integrator/hardware.h +++ b/include/asm-arm/arch-integrator/hardware.h | |||
| @@ -33,15 +33,6 @@ | |||
| 33 | #define IO_SIZE 0x0B000000 // How much? | 33 | #define IO_SIZE 0x0B000000 // How much? |
| 34 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO | 34 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO |
| 35 | 35 | ||
| 36 | /* | ||
| 37 | * Similar to above, but for PCI addresses (memory, IO, Config and the | ||
| 38 | * V3 chip itself). WARNING: this has to mirror definitions in platform.h | ||
| 39 | */ | ||
| 40 | #define PCI_MEMORY_VADDR 0xe8000000 | ||
| 41 | #define PCI_CONFIG_VADDR 0xec000000 | ||
| 42 | #define PCI_V3_VADDR 0xed000000 | ||
| 43 | #define PCI_IO_VADDR 0xee000000 | ||
| 44 | |||
| 45 | #define PCIO_BASE PCI_IO_VADDR | 36 | #define PCIO_BASE PCI_IO_VADDR |
| 46 | #define PCIMEM_BASE PCI_MEMORY_VADDR | 37 | #define PCIMEM_BASE PCI_MEMORY_VADDR |
| 47 | 38 | ||