diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-23 16:35:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-23 16:35:04 -0400 |
| commit | 8be7cdccacfbfc707e7370cad9bb168defed636f (patch) | |
| tree | 8416607b62ec352176c81afd6f4e7b571ceb957f /drivers/net/ucc_geth.h | |
| parent | ecd4137320b59759bbe57eef89040ee3e5e66039 (diff) | |
| parent | 61fa9dcf9329cb92c220f7b656410fbe5e72f933 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ucc_geth.c
Diffstat (limited to 'drivers/net/ucc_geth.h')
| -rw-r--r-- | drivers/net/ucc_geth.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h index 66d18971fa0c..e3a25e64a652 100644 --- a/drivers/net/ucc_geth.h +++ b/drivers/net/ucc_geth.h | |||
| @@ -1101,8 +1101,7 @@ struct ucc_geth_info { | |||
| 1101 | u32 eventRegMask; | 1101 | u32 eventRegMask; |
| 1102 | u16 pausePeriod; | 1102 | u16 pausePeriod; |
| 1103 | u16 extensionField; | 1103 | u16 extensionField; |
| 1104 | u8 phy_address; | 1104 | char phy_bus_id[BUS_ID_SIZE]; |
| 1105 | char mdio_bus[MII_BUS_ID_SIZE]; | ||
| 1106 | u8 weightfactor[NUM_TX_QUEUES]; | 1105 | u8 weightfactor[NUM_TX_QUEUES]; |
| 1107 | u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES]; | 1106 | u8 interruptcoalescingmaxvalue[NUM_RX_QUEUES]; |
| 1108 | u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX]; | 1107 | u8 l2qt[UCC_GETH_VLAN_PRIORITY_MAX]; |