aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-04-16 21:05:48 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-04-16 21:05:48 +0000
commitf0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b (patch)
treec39e3a477111f347c5ab70ad4246ce8121797d32 /target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch
parent1414f1647d435a7eda48d9433a022286a46d9097 (diff)
downloadupstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.tar.gz
upstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.tar.bz2
upstream-f0b3964f1b8c2092e4eb1c467c9730a3adbe6c6b.zip
kernel: update kernel 4.4 to version 4.4.7
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 49176
Diffstat (limited to 'target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch b/target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch
index 1955c01806..c33861e638 100644
--- a/target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch
+++ b/target/linux/bcm53xx/patches-4.4/088-PCI-iproc-Allow-multiple-devices-except-on-PAXC.patch
@@ -30,7 +30,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
#define IPROC_PCIE_REG_INVALID 0xffff
-@@ -170,20 +169,6 @@ static inline void iproc_pcie_ob_write(struct iproc_pcie *pcie,
+@@ -170,20 +169,6 @@ static inline void iproc_pcie_ob_write(s
writel(val, pcie->base + offset + (window * 8));
}
@@ -51,7 +51,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
/**
* Note access to the configuration registers are protected at the higher layer
* by 'pci_lock' in drivers/pci/access.c
-@@ -199,11 +184,11 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus,
+@@ -199,11 +184,11 @@ static void __iomem *iproc_pcie_map_cfg_
u32 val;
u16 offset;
@@ -66,7 +66,7 @@ Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
iproc_pcie_write_reg(pcie, IPROC_PCIE_CFG_IND_ADDR,
where & CFG_IND_ADDR_MASK);
offset = iproc_pcie_reg_offset(pcie, IPROC_PCIE_CFG_IND_DATA);
-@@ -213,6 +198,14 @@ static void __iomem *iproc_pcie_map_cfg_bus(struct pci_bus *bus,
+@@ -213,6 +198,14 @@ static void __iomem *iproc_pcie_map_cfg_
return (pcie->base + offset);
}