kernel.h: drop inclusion in bitmap.h

[linux-2.6-microblaze.git] / include / linux / marvell_phy.h

diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h
index c544b70..acee44b 100644 (file)
--- a/include/linux/marvell_phy.h
+++ b/include/linux/marvell_phy.h
@@ -22,8 +22,13 @@
 #define MARVELL_PHY_ID_88E1545         0x01410ea0
 #define MARVELL_PHY_ID_88E1548P                0x01410ec0
 #define MARVELL_PHY_ID_88E3016         0x01410e60
-#define MARVELL_PHY_ID_88X3310         0x002b09a0
 #define MARVELL_PHY_ID_88E2110         0x002b09b0
+#define MARVELL_PHY_ID_88X2222         0x01410f10
+
+/* PHY IDs and mask for Alaska 10G PHYs */
+#define MARVELL_PHY_ID_88X33X0_MASK    0xfffffff8
+#define MARVELL_PHY_ID_88X3310         0x002b09a0
+#define MARVELL_PHY_ID_88X3340         0x002b09a8
 
 /* Marvel 88E1111 in Finisar SFP module with modified PHY ID */
 #define MARVELL_PHY_ID_88E1111_FINISAR 0x01ff0cc0
@@ -34,6 +39,7 @@
  */
 #define MARVELL_PHY_ID_88E6341_FAMILY  0x01410f41
 #define MARVELL_PHY_ID_88E6390_FAMILY  0x01410f90
+#define MARVELL_PHY_ID_88E6393_FAMILY  0x002b0b9b
 
 #define MARVELL_PHY_FAMILY_ID(id)      ((id) >> 4)