nfsd4: shutdown callbacks on expiry

[safe/jmp/linux-2.6] / drivers / net / s2io-regs.h

diff --git a/drivers/net/s2io-regs.h b/drivers/net/s2io-regs.h
index 2109508..416669f 100644 (file)
--- a/drivers/net/s2io-regs.h
+++ b/drivers/net/s2io-regs.h
@@ -250,7 +250,7 @@ struct XENA_dev_config {
        u64 tx_mat0_n[0x8];
 #define TX_MAT_SET(fifo, msi)                  vBIT(msi, (8 * fifo), 8)
 
-       u8 unused_1[0x8];
+       u64 xmsi_mask_reg;
        u64 stat_byte_cnt;
 #define STAT_BC(n)                              vBIT(n,4,12)
 
@@ -271,11 +271,6 @@ struct XENA_dev_config {
        u64 mdio_control;
 #define MDIO_MMD_INDX_ADDR(val)                vBIT(val, 0, 16)
 #define MDIO_MMD_DEV_ADDR(val)         vBIT(val, 19, 5)
-#define MDIO_MMD_PMA_DEV_ADDR          0x1
-#define MDIO_MMD_PMD_DEV_ADDR          0x1
-#define MDIO_MMD_WIS_DEV_ADDR          0x2
-#define MDIO_MMD_PCS_DEV_ADDR          0x3
-#define MDIO_MMD_PHYXS_DEV_ADDR                0x4
 #define MDIO_MMS_PRT_ADDR(val)         vBIT(val, 27, 5)
 #define MDIO_CTRL_START_TRANS(val)     vBIT(val, 56, 4)
 #define MDIO_OP(val)                   vBIT(val, 60, 2)