[kernel] r10681 - dists/etch/linux-2.6/debian/patches/features

[Bastian Blank]

Author: waldi
Date: Sat Mar  1 08:56:41 2008
New Revision: 10681

Log:
debian/patches/features/e1000-quad-82571EB-ids.patch: Fix.


Modified:
   dists/etch/linux-2.6/debian/patches/features/e1000-quad-82571EB-ids.patch

Modified: dists/etch/linux-2.6/debian/patches/features/e1000-quad-82571EB-ids.patch
==============================================================================
--- dists/etch/linux-2.6/debian/patches/features/e1000-quad-82571EB-ids.patch	(original)
+++ dists/etch/linux-2.6/debian/patches/features/e1000-quad-82571EB-ids.patch	Sat Mar  1 08:56:41 2008
@@ -95,16 +95,14 @@
  	/* required last entry */
  	{0,}
  };
-@@ -791,8 +795,10 @@ e1000_probe(struct pci_dev *pdev,
+@@ -791,7 +795,9 @@ e1000_probe(struct pci_dev *pdev,
  		DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n");
  
  	/* if ksp3, indicate if it's port a being setup */
 -	if (pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 &&
--			e1000_ksp3_port_a == 0)
 +	if ((pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 ||
 +	     pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 ||
 +	     pdev->device == E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE) &&
-+			e1000_ksp3_port_a == 0))
+ 			e1000_ksp3_port_a == 0)
  		adapter->ksp3_port_a = 1;
  	e1000_ksp3_port_a++;
- 	/* Reset for multiple KP3 adapters */