aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:53:04 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-12 20:53:04 +0000
commitde18003b6e759e1f5309cd3f00d63f6b447f5fe1 (patch)
tree3221367a6827f83a068a290cd876b19b4c88454f /target/linux/cns3xxx
parentcdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (diff)
downloadupstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.gz
upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.bz2
upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.zip
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48225
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-3.18/031-pcie_init.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch b/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch
index 3c739c559a..651d1a2f07 100644
--- a/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch
+++ b/target/linux/cns3xxx/patches-3.18/031-pcie_init.patch
@@ -24,7 +24,7 @@
static int __init laguna_model_setup(void)
{
u32 __iomem *mem;
-@@ -1075,5 +1065,6 @@ MACHINE_START(GW2388, "Gateworks Corpora
+@@ -1077,5 +1067,6 @@ MACHINE_START(GW2388, "Gateworks Corpora
.init_irq = cns3xxx_init_irq,
.init_time = cns3xxx_timer_init,
.init_machine = laguna_init,