Merge branches 'release' and 'hp-cid' into release

[pandora-kernel.git] / drivers / net / dl2k.h

diff --git a/drivers/net/dl2k.h b/drivers/net/dl2k.h
index 5f00ecb..266ec87 100644 (file)
--- a/drivers/net/dl2k.h
+++ b/drivers/net/dl2k.h
@@ -364,18 +364,6 @@ enum _mii_anlpar {
 };
 
 /* Auto-Negotiation Expansion Register */
-typedef union t_MII_ANER {
-       u16 image;
-       struct {
-               u16 lp_negotiable:1;    // bit 0
-               u16 page_received:1;    // bit 1
-               u16 nextpagable:1;      // bit 2
-               u16 lp_nextpagable:1;   // bit 3
-               u16 pdetect_fault:1;    // bit 4
-               u16 _bit15_5:11;        // bit 15:5
-       } bits;
-} ANER_t, *PANER_t;
-
 enum _mii_aner {
        MII_ANER_PAR_DETECT_FAULT = 0x0010,
        MII_ANER_LP_NEXTPAGABLE = 0x0008,
@@ -400,8 +388,8 @@ enum _mii_mssr {
        MII_MSSR_CFG_RES = 0x4000,
        MII_MSSR_LOCAL_RCV_STATUS = 0x2000,
        MII_MSSR_REMOTE_RCVR = 0x1000,
-       MII_MSSR_LP_1000BT_HD = 0x0800,
-       MII_MSSR_LP_1000BT_FD = 0x0400,
+       MII_MSSR_LP_1000BT_FD = 0x0800,
+       MII_MSSR_LP_1000BT_HD = 0x0400,
        MII_MSSR_IDLE_ERR_COUNT = 0x00ff,
 };