projects
/
openwrt-working-2016
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
octeon: update to linux 4.4
[openwrt-working-2016/.git]
/
target
/
linux
/
octeon
/
patches-4.4
/
110-er200-ethernet_probe_order.patch
diff --git
a/target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
b/target/linux/octeon/patches-4.4/110-er200-ethernet_probe_order.patch
similarity index 89%
rename from
target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
rename to
target/linux/octeon/patches-4.4/110-er200-ethernet_probe_order.patch
index 0bd8968a09c0e12eb38a7a8880c1547d64f57925..71d45a0f51aeb0fc328eda9507298c268b741a88 100644
(file)
--- a/
target/linux/octeon/patches-4.3/110-er200-ethernet_probe_order.patch
+++ b/
target/linux/octeon/patches-4.4/110-er200-ethernet_probe_order.patch
@@
-1,6
+1,6
@@
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
-@@ -66
3,6 +663
,7 @@ static int cvm_oct_probe(struct platform
+@@ -66
7,6 +667
,7 @@ static int cvm_oct_probe(struct platform
int interface;
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
int qos;
int interface;
int fau = FAU_NUM_PACKET_BUFFERS_TO_FREE;
int qos;
@@
-8,7
+8,7
@@
struct device_node *pip;
octeon_mdiobus_force_mod_depencency();
struct device_node *pip;
octeon_mdiobus_force_mod_depencency();
-@@ -7
47,13 +748
,19 @@ static int cvm_oct_probe(struct platform
+@@ -7
51,13 +752
,19 @@ static int cvm_oct_probe(struct platform
}
num_interfaces = cvmx_helper_get_number_of_interfaces();
}
num_interfaces = cvmx_helper_get_number_of_interfaces();