Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / include / linux / brcmphy.h

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 7ccd928cc1f29b71afc7b7cf5cf1ea6a855cd70f..ae2982c0f7a60ed93339e767feaf1fc89aa02134 100644 (file)
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -11,6 +11,7 @@
 #define PHY_ID_BCM5421                 0x002060e0
 #define PHY_ID_BCM5464                 0x002060b0
 #define PHY_ID_BCM5461                 0x002060c0
+#define PHY_ID_BCM54616S               0x03625d10
 #define PHY_ID_BCM57780                        0x03625d90
 
 #define PHY_ID_BCM7250                 0xae025280
@@ -19,6 +20,7 @@
 #define PHY_ID_BCM7425                 0x03625e60
 #define PHY_ID_BCM7429                 0x600d8730
 #define PHY_ID_BCM7439                 0x600d8480
+#define PHY_ID_BCM7439_2               0xae025080
 #define PHY_ID_BCM7445                 0x600d8510
 
 #define PHY_BCM_OUI_MASK               0xfffffc00