From e5441232a81d01e2ed46d88e340a30fd6b15b012 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Wed, 10 Sep 2014 21:40:19 +0000 Subject: kernel: update 3.14 to 3.14.18 Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../octeon/patches-3.14/110-er200-ethernet_probe_order.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch') diff --git a/target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch b/target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch index 0670f616cd..1771fba517 100644 --- a/target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch +++ b/target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch @@ -1,8 +1,6 @@ -Index: linux-3.14.14/drivers/staging/octeon/ethernet.c -=================================================================== ---- linux-3.14.14.orig/drivers/staging/octeon/ethernet.c 2014-08-07 17:03:44.000000000 +0200 -+++ linux-3.14.14/drivers/staging/octeon/ethernet.c 2014-08-07 17:07:31.768932379 +0200 -@@ -624,6 +624,7 @@ +--- a/drivers/staging/octeon/ethernet.c ++++ b/drivers/staging/octeon/ethernet.c +@@ -624,6 +624,7 @@ static int cvm_oct_probe(struct platform int interface; int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE; int qos; @@ -10,7 +8,7 @@ Index: linux-3.14.14/drivers/staging/octeon/ethernet.c struct device_node *pip; octeon_mdiobus_force_mod_depencency(); -@@ -707,13 +708,19 @@ +@@ -707,13 +708,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces(); -- cgit v1.2.3