diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
| tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch | |
| parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
| download | upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip | |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch')
| -rw-r--r-- | target/linux/octeon/patches-3.14/110-er200-ethernet_probe_order.patch | 10 |
1 files changed, 4 insertions, 6 deletions
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(); |