kernel/3.18: update to version 3.18.25

[openwrt/openwrt.git] / target / linux / generic / patches-3.18 / 735-net-phy-at803x-fix-at8033-sgmii-mode.patch

diff --git a/target/linux/generic/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
index 117f15d634e6601360435097a6be6389d5e0a6f3..4a8f532aa36f729339e01ebadd6ea3cb292d7ac9 100644 (file)
--- a/target/linux/generic/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
+++ b/target/linux/generic/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
@@ -24,7 +24,7 @@
  
  MODULE_DESCRIPTION("Atheros 803x PHY driver");
  MODULE_AUTHOR("Matus Ujhelyi");
-@@ -268,6 +272,27 @@ static int at803x_config_init(struct phy
+@@ -267,6 +271,27 @@ static int at803x_config_init(struct phy
  {
        struct at803x_platform_data *pdata;
        int ret;
@@ -52,7 +52,7 @@
  
        ret = genphy_config_init(phydev);
        if (ret < 0)
-@@ -394,7 +419,7 @@ static struct phy_driver at803x_driver[]
+@@ -393,7 +418,7 @@ static struct phy_driver at803x_driver[]
        /* ATHEROS 8035 */
        .phy_id                 = ATH8035_PHY_ID,
        .name                   = "Atheros 8035 ethernet",
@@ -61,7 +61,7 @@
        .probe                  = at803x_probe,
        .config_init            = at803x_config_init,
        .link_change_notify     = at803x_link_change_notify,
-@@ -413,7 +438,7 @@ static struct phy_driver at803x_driver[]
+@@ -412,7 +437,7 @@ static struct phy_driver at803x_driver[]
        /* ATHEROS 8030 */
        .phy_id                 = ATH8030_PHY_ID,
        .name                   = "Atheros 8030 ethernet",
@@ -70,7 +70,7 @@
        .probe                  = at803x_probe,
        .config_init            = at803x_config_init,
        .link_change_notify     = at803x_link_change_notify,
-@@ -431,8 +456,8 @@ static struct phy_driver at803x_driver[]
+@@ -430,8 +455,8 @@ static struct phy_driver at803x_driver[]
  }, {
        /* ATHEROS 8031 */
        .phy_id                 = ATH8031_PHY_ID,
@@ -81,8 +81,8 @@
        .probe                  = at803x_probe,
        .config_init            = at803x_config_init,
        .link_change_notify     = at803x_link_change_notify,
-@@ -454,9 +479,9 @@ static struct phy_driver at803x_driver[]
- module_phy_driver(at803x_driver);
+@@ -465,9 +490,9 @@ module_init(atheros_init);
+ module_exit(atheros_exit);
  
  static struct mdio_device_id __maybe_unused atheros_tbl[] = {
 -      { ATH8030_PHY_ID, 0xffffffef },