diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 17:31:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 17:31:04 -0400 |
| commit | 534d0c92cfc45174fbfeca2f3dd54c3ce332725e (patch) | |
| tree | 6f944e0878ca6fc71a844a93aabe81c60fe5f693 /arch/arm/include | |
| parent | 610ea6c671685a09afff7ba521bdccda21c84c76 (diff) | |
| parent | f00f510ab33f3e689e35ccdbb8dc264168aa5250 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/hardware/iop3xx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/iop3xx.h b/arch/arm/include/asm/hardware/iop3xx.h index 4b8e7f559929..8d60ad267e3a 100644 --- a/arch/arm/include/asm/hardware/iop3xx.h +++ b/arch/arm/include/asm/hardware/iop3xx.h | |||
| @@ -215,6 +215,7 @@ extern int iop3xx_get_init_atu(void); | |||
| 215 | * IOP3XX I/O and Mem space regions for PCI autoconfiguration | 215 | * IOP3XX I/O and Mem space regions for PCI autoconfiguration |
| 216 | */ | 216 | */ |
| 217 | #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 | 217 | #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 |
| 218 | #define IOP3XX_PCI_MEM_WINDOW_SIZE 0x08000000 | ||
| 218 | 219 | ||
| 219 | #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 | 220 | #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 |
| 220 | #define IOP3XX_PCI_LOWER_IO_PA 0x90000000 | 221 | #define IOP3XX_PCI_LOWER_IO_PA 0x90000000 |