aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:59:26 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-07-11 19:59:26 +0000
commit763e2502b60f623601ceb0fb4740cfa61bccf469 (patch)
tree66a9cb5ef165ce2308d11e52341470d720440569 /target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch
parente0402257e55e76239ee48b67389e1febb6589d57 (diff)
downloadupstream-763e2502b60f623601ceb0fb4740cfa61bccf469.tar.gz
upstream-763e2502b60f623601ceb0fb4740cfa61bccf469.tar.bz2
upstream-763e2502b60f623601ceb0fb4740cfa61bccf469.zip
kernel: update 4.1 to 4.1.2
Changelog: * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46301
Diffstat (limited to 'target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch')
-rw-r--r--target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch
index fa2e59b2ef..41a6d91588 100644
--- a/target/linux/generic/patches-4.1/704-phy-no-genphy-soft-reset.patch
+++ b/target/linux/generic/patches-4.1/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
-@@ -1146,7 +1146,7 @@ int genphy_config_init(struct phy_device
+@@ -1147,7 +1147,7 @@ int genphy_config_init(struct phy_device
return 0;
}
@@ -9,7 +9,7 @@
{
/* Do nothing for now */
return 0;
-@@ -1360,7 +1360,7 @@ static struct phy_driver genphy_driver[]
+@@ -1361,7 +1361,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 |
-@@ -1375,7 +1375,7 @@ static struct phy_driver genphy_driver[]
+@@ -1376,7 +1376,7 @@ static struct phy_driver genphy_driver[]
.phy_id = 0xffffffff,
.phy_id_mask = 0xffffffff,
.name = "Generic 10G PHY",