diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 12:03:40 +0530 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /arch/arm/plat-iop/pci.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
| download | lwn-c84d6efd363a3948eb32ec40d46bab6338580454.tar.gz lwn-c84d6efd363a3948eb32ec40d46bab6338580454.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/arm/plat-iop/pci.c')
| -rw-r--r-- | arch/arm/plat-iop/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index 77fa7cc7d162..ce31f316ac75 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c @@ -257,7 +257,8 @@ void __init iop3xx_atu_setup(void) *IOP3XX_OUMWTVR0 = 0; /* Outbound window 1 */ - *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + IOP3XX_PCI_MEM_WINDOW_SIZE; + *IOP3XX_OMWTVR1 = IOP3XX_PCI_LOWER_MEM_BA + + IOP3XX_PCI_MEM_WINDOW_SIZE / 2; *IOP3XX_OUMWTVR1 = 0; /* BAR 3 ( Disabled ) */ |