diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 21:59:21 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 21:59:21 +0400 |
| commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
| tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/mach-orion5x/pci.c | |
| parent | c69bb7bd60fdbb96b57359c7bb0990a7531e0ed1 (diff) | |
| parent | 94c5216ee93b3b4170e7de1556ae6fffd2414c71 (diff) | |
| download | linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.tar.xz | |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-orion5x/pci.c')
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 7fab67053030..87a12d6930ff 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -240,11 +240,11 @@ static int __init pcie_setup(struct pci_sys_data *sys) #define PCI_BAR_SIZE_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc08) : \ ((n) == 1) ? ORION5X_PCI_REG(0xd08) : \ ((n) == 2) ? ORION5X_PCI_REG(0xc0c) : \ - ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : 0) + ((n) == 3) ? ORION5X_PCI_REG(0xd0c) : NULL) #define PCI_BAR_REMAP_DDR_CS(n) (((n) == 0) ? ORION5X_PCI_REG(0xc48) : \ ((n) == 1) ? ORION5X_PCI_REG(0xd48) : \ ((n) == 2) ? ORION5X_PCI_REG(0xc4c) : \ - ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : 0) + ((n) == 3) ? ORION5X_PCI_REG(0xd4c) : NULL) #define PCI_BAR_ENABLE ORION5X_PCI_REG(0xc3c) #define PCI_ADDR_DECODE_CTRL ORION5X_PCI_REG(0xd3c) |