diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:53:04 +0000 |
commit | de18003b6e759e1f5309cd3f00d63f6b447f5fe1 (patch) | |
tree | 3221367a6827f83a068a290cd876b19b4c88454f /target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch | |
parent | cdb83aaf5fe8de98b909d6655d6c7b9d8d2aadb2 (diff) | |
download | upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.gz upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.tar.bz2 upstream-de18003b6e759e1f5309cd3f00d63f6b447f5fe1.zip |
kernel/3.18: update to version 3.18.25
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48225
Diffstat (limited to 'target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch')
-rw-r--r-- | target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch b/target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch index 53abcc33ed..0d021ac7bd 100644 --- a/target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch +++ b/target/linux/generic/patches-3.18/734-net-phy-at803x-allow-to-configure-via-pdata.patch @@ -84,7 +84,7 @@ /* save relevant PHY registers to private copy */ static void at803x_context_save(struct phy_device *phydev, struct at803x_context *context) -@@ -209,8 +257,16 @@ static int at803x_probe(struct phy_devic +@@ -208,8 +256,16 @@ static int at803x_probe(struct phy_devic return 0; } @@ -101,7 +101,7 @@ int ret; ret = genphy_config_init(phydev); -@@ -228,6 +284,26 @@ static int at803x_config_init(struct phy +@@ -227,6 +283,26 @@ static int at803x_config_init(struct phy return ret; } @@ -128,7 +128,7 @@ return 0; } -@@ -259,6 +335,8 @@ static int at803x_config_intr(struct phy +@@ -258,6 +334,8 @@ static int at803x_config_intr(struct phy static void at803x_link_change_notify(struct phy_device *phydev) { struct at803x_priv *priv = phydev->priv; @@ -137,7 +137,7 @@ /* * Conduct a hardware reset for AT8030 every time a link loss is -@@ -289,6 +367,26 @@ static void at803x_link_change_notify(st +@@ -288,6 +366,26 @@ static void at803x_link_change_notify(st priv->phy_reset = false; } } |