kernel: update 4.1 to 4.1.10

[openwrt.git] / target / linux / lantiq / patches-4.1 / 0001-MIPS-lantiq-add-pcie-driver.patch

diff --git a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch
index 0e49743..e65e982 100644 (file)
--- a/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-4.1/0001-MIPS-lantiq-add-pcie-driver.patch
@@ -1105,7 +1105,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      int pcie_port = ctrl->port;
 +      u32 reg;
 +
-+      printk("PCIe RC error intr %d\n", irq);
++      pr_debug("PCIe RC error intr %d\n", irq);
 +      reg = IFX_REG_R32(PCIE_IRNCR(pcie_port));
 +      reg &= PCIE_RC_CORE_COMBINED_INT;
 +      IFX_REG_W32(reg, PCIE_IRNCR(pcie_port));
@@ -5514,7 +5514,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
          (transaction layer end-to-end CRC checking).
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
-@@ -1175,6 +1175,8 @@ void pci_walk_bus(struct pci_bus *top, i
+@@ -1179,6 +1179,8 @@ void pci_walk_bus(struct pci_bus *top, i
                  void *userdata);
  int pci_cfg_space_size(struct pci_dev *dev);
  unsigned char pci_bus_max_busnr(struct pci_bus *bus);