summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:58:44 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:58:44 +0000
commit58b66cdd75bc9b24acddcbccb46e8bfed4426c96 (patch)
treee4bf2c21711f0175e4d1e74ade4f7cd8319f7d1f /target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
parent05ae45ac6fa2b8a090b2854ba72ef490bf2584ff (diff)
downloadmtk-20170518-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.zip
mtk-20170518-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.gz
mtk-20170518-58b66cdd75bc9b24acddcbccb46e8bfed4426c96.tar.bz2
kernel: update 3.18 to 3.18.18
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46299
Diffstat (limited to 'target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch')
-rw-r--r--target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
index c255415..0350f9e 100644
--- a/target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
+++ b/target/linux/generic/patches-3.18/704-phy-no-genphy-soft-reset.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
-@@ -1132,7 +1132,7 @@ int genphy_config_init(struct phy_device
+@@ -1133,7 +1133,7 @@ int genphy_config_init(struct phy_device
return 0;
}
@@ -9,7 +9,7 @@
{
/* Do nothing for now */
return 0;
-@@ -1346,7 +1346,7 @@ static struct phy_driver genphy_driver[]
+@@ -1347,7 +1347,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic PHY",
@@ -18,7 +18,7 @@
.config_init = genphy_config_init,
.features = PHY_GBIT_FEATURES | SUPPORTED_MII |
SUPPORTED_AUI | SUPPORTED_FIBRE |
-@@ -1361,7 +1361,7 @@ static struct phy_driver genphy_driver[]
+@@ -1362,7 +1362,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic 10G PHY",