X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Focteon%2Fpatches-4.4%2F110-er200-ethernet_probe_order.patch;fp=target%2Flinux%2Focteon%2Fpatches-4.3%2F110-er200-ethernet_probe_order.patch;h=71d45a0f51aeb0fc328eda9507298c268b741a88;hb=3f3e0bf693f18f6497273c723f6f3db577762599;hp=0bd8968a09c0e12eb38a7a8880c1547d64f57925;hpb=0e2052a43ad9da619b99296727f11b8a34d9e088;p=openwrt-working-2016%2F.git 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 0bd8968a09..71d45a0f51 100644 --- 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 -@@ -663,6 +663,7 @@ static int cvm_oct_probe(struct platform +@@ -667,6 +667,7 @@ static int cvm_oct_probe(struct platform 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(); -@@ -747,13 +748,19 @@ static int cvm_oct_probe(struct platform +@@ -751,13 +752,19 @@ static int cvm_oct_probe(struct platform } num_interfaces = cvmx_helper_get_number_of_interfaces();