diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 09:54:55 +0000 |
| commit | 72d1d554f3f6cb6132831a2c716f91f81619339f (patch) | |
| tree | 4a3f56e2ebf8f1a7727e46823869007241bef383 /target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch | |
| parent | b0364064f437100a45a81cbbb636cbf4260ce5ff (diff) | |
| download | master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.gz master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.tar.bz2 master-187ad058-72d1d554f3f6cb6132831a2c716f91f81619339f.zip | |
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46011 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch b/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch index 04de41b0fc..26a3a65142 100644 --- a/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch +++ b/target/linux/lantiq/patches-3.18/0151-lantiq-ifxmips_pcie-use-of.patch @@ -9,16 +9,16 @@ #include "ifxmips_pcie.h" #include "ifxmips_pcie_reg.h" -@@ -1048,7 +1050,7 @@ pcie_rc_initialize(int pcie_port) - extern int (*ltq_pci_plat_arch_init)(struct pci_dev *dev); - extern int (*ltq_pci_map_irq)(const struct pci_dev *dev, u8 slot, u8 pin); +@@ -1045,7 +1047,7 @@ pcie_rc_initialize(int pcie_port) + return 0; + } -static int __init ifx_pcie_bios_init(void) +static int __init ifx_pcie_bios_probe(struct platform_device *pdev) { void __iomem *io_map_base; int pcie_port; -@@ -1090,6 +1092,30 @@ static int __init ifx_pcie_bios_init(voi +@@ -1083,6 +1085,30 @@ static int __init ifx_pcie_bios_init(voi return 0; } |