Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 72cb67b66e0c..92a9696fdebe 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -72,6 +72,9 @@ struct mii_bus {
         /* list of all PHYs on bus */
         struct phy_device *phy_map[PHY_MAX_ADDR];
 
+        /* Phy addresses to be ignored when probing */
+        u32 phy_mask;
+
         /* Pointer to an array of interrupts, each PHY's
          * interrupt at the index matching its address */
         int *irq;