diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
| commit | 76d079204df113afa9e382a43abb5e1a2135150d (patch) | |
| tree | 8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch | |
| parent | 072937888e133f5e97fd05a7496eaf7eeae04079 (diff) | |
| download | upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2 upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip | |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 45711
Diffstat (limited to 'target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch')
| -rw-r--r-- | target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch b/target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch index 6549db01a9..b54f00e38a 100644 --- a/target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch +++ b/target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch @@ -1,7 +1,5 @@ -Index: linux-3.18-rc4/drivers/pci/host/Kconfig -=================================================================== ---- linux-3.18-rc4.orig/drivers/pci/host/Kconfig -+++ linux-3.18-rc4/drivers/pci/host/Kconfig +--- a/drivers/pci/host/Kconfig ++++ b/drivers/pci/host/Kconfig @@ -91,4 +91,9 @@ config PCI_XGENE There are 5 internal PCIe ports available. Each port is GEN3 capable and have varied lanes from x1 to x8. @@ -12,10 +10,8 @@ Index: linux-3.18-rc4/drivers/pci/host/Kconfig + select PCIEPORTBUS + endmenu -Index: linux-3.18-rc4/drivers/pci/host/Makefile -=================================================================== ---- linux-3.18-rc4.orig/drivers/pci/host/Makefile -+++ linux-3.18-rc4/drivers/pci/host/Makefile +--- a/drivers/pci/host/Makefile ++++ b/drivers/pci/host/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o obj-$(CONFIG_PCI_IMX6) += pci-imx6.o |