diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 22:31:04 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-02 22:31:04 +0100 |
| commit | 534d0c92cfc45174fbfeca2f3dd54c3ce332725e (patch) | |
| tree | 6f944e0878ca6fc71a844a93aabe81c60fe5f693 /arch/arm/mach-iop32x/include/mach/iop32x.h | |
| 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/mach-iop32x/include/mach/iop32x.h')
| -rw-r--r-- | arch/arm/mach-iop32x/include/mach/iop32x.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/iop32x.h b/arch/arm/mach-iop32x/include/mach/iop32x.h index abd9eb49f10..941f363aca5 100644 --- a/arch/arm/mach-iop32x/include/mach/iop32x.h +++ b/arch/arm/mach-iop32x/include/mach/iop32x.h @@ -31,7 +31,5 @@ #define IOP32X_MAX_RAM_SIZE 0x40000000UL #define IOP3XX_MAX_RAM_SIZE IOP32X_MAX_RAM_SIZE #define IOP3XX_PCI_LOWER_MEM_BA 0x80000000 -#define IOP32X_PCI_MEM_WINDOW_SIZE 0x04000000 -#define IOP3XX_PCI_MEM_WINDOW_SIZE IOP32X_PCI_MEM_WINDOW_SIZE #endif |