diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2009-12-01 02:16:22 -0500 |
| commit | 838632438145ac6863377eb12d8b8eef9c55d288 (patch) | |
| tree | fbb0757df837f3c75a99c518a3596c38daef162d /arch/arm/mach-kirkwood/include/mach/kirkwood.h | |
| parent | 9996508b3353063f2d6c48c1a28a84543d72d70b (diff) | |
| parent | 29e553631b2a0d4eebd23db630572e1027a9967a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/kirkwood.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 54c132731d2d..a15cf0ee22bd 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #define KIRKWOOD_REGS_SIZE SZ_1M | 43 | #define KIRKWOOD_REGS_SIZE SZ_1M |
| 44 | 44 | ||
| 45 | #define KIRKWOOD_PCIE_MEM_PHYS_BASE 0xe0000000 | 45 | #define KIRKWOOD_PCIE_MEM_PHYS_BASE 0xe0000000 |
| 46 | #define KIRKWOOD_PCIE_MEM_BUS_BASE 0xe0000000 | ||
| 46 | #define KIRKWOOD_PCIE_MEM_SIZE SZ_128M | 47 | #define KIRKWOOD_PCIE_MEM_SIZE SZ_128M |
| 47 | 48 | ||
| 48 | /* | 49 | /* |