[linux] 01/03: drivers/net/phy/marvell: Fix mis-applied patch causing build failure

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 507f588e7260ae77f3fe01cac1b8728741e0a4e5
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Sep 3 12:58:04 2016 +0100

    drivers/net/phy/marvell: Fix mis-applied patch causing build failure
    
    We patch out some of the code here by inserting #if 0...#endif.  When
    I last rebased, one of the #endifs ended up much too far down.
---
 .../bugfix/all/disable-some-marvell-phys.patch       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/bugfix/all/disable-some-marvell-phys.patch b/debian/patches/bugfix/all/disable-some-marvell-phys.patch
index f6c7727..697929b 100644
--- a/debian/patches/bugfix/all/disable-some-marvell-phys.patch
+++ b/debian/patches/bugfix/all/disable-some-marvell-phys.patch
@@ -16,7 +16,7 @@ correctness.
 
 --- a/drivers/net/phy/marvell.c
 +++ b/drivers/net/phy/marvell.c
-@@ -681,6 +681,7 @@ static int m88e1118_config_init(struct p
+@@ -906,6 +906,7 @@ static int m88e1118_config_init(struct p
  	return phy_write(phydev, MII_BMCR, BMCR_RESET);
  }
  
@@ -24,7 +24,7 @@ correctness.
  static int m88e1149_config_init(struct phy_device *phydev)
  {
  	int err;
-@@ -706,7 +707,9 @@ static int m88e1149_config_init(struct p
+@@ -931,7 +932,9 @@ static int m88e1149_config_init(struct p
  
  	return phy_write(phydev, MII_BMCR, BMCR_RESET);
  }
@@ -34,15 +34,15 @@ correctness.
  static int m88e1145_config_init(struct phy_device *phydev)
  {
  	int err;
-@@ -787,6 +790,7 @@ static int m88e1145_config_init(struct p
+@@ -1012,6 +1015,7 @@ static int m88e1145_config_init(struct p
  
  	return 0;
  }
 +#endif
  
- /* marvell_read_status
-  *
-@@ -1180,6 +1184,7 @@ static struct phy_driver marvell_drivers
+ /**
+  * fiber_lpa_to_ethtool_lpa_t
+@@ -1595,6 +1599,7 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -50,7 +50,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1145,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1198,6 +1203,8 @@ static struct phy_driver marvell_drivers
+@@ -1613,6 +1618,8 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -59,7 +59,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1149R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1216,6 +1223,8 @@ static struct phy_driver marvell_drivers
+@@ -1631,6 +1638,8 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -68,7 +68,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1240,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1234,6 +1243,7 @@ static struct phy_driver marvell_drivers
+@@ -1649,6 +1658,7 @@ static struct phy_driver marvell_drivers
  		.get_strings = marvell_get_strings,
  		.get_stats = marvell_get_stats,
  	},
@@ -76,7 +76,7 @@ correctness.
  	{
  		.phy_id = MARVELL_PHY_ID_88E1116R,
  		.phy_id_mask = MARVELL_PHY_ID_MASK,
-@@ -1318,9 +1328,9 @@ static struct mdio_device_id __maybe_unu
+@@ -1735,9 +1745,9 @@ static struct mdio_device_id __maybe_unu
  	{ MARVELL_PHY_ID_88E1111, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1118, MARVELL_PHY_ID_MASK },
  	{ MARVELL_PHY_ID_88E1121R, MARVELL_PHY_ID_MASK },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git