diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-25 19:20:38 -0800 |
| commit | 041110a439e21cd40709ead4ffbfa8034619ad77 (patch) | |
| tree | 4d9f792625a61fa26bc5085f0bfab6208f1ff0ec /drivers/net/igbvf/vf.h | |
| parent | a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f (diff) | |
| parent | 2316aa2aee254c126e688b53a3a105b82bc3f368 (diff) | |
| download | op-kernel-dev-041110a439e21cd40709ead4ffbfa8034619ad77.zip op-kernel-dev-041110a439e21cd40709ead4ffbfa8034619ad77.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igbvf/vf.h')
| -rw-r--r-- | drivers/net/igbvf/vf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h index c36ea21..d7ed58f 100644 --- a/drivers/net/igbvf/vf.h +++ b/drivers/net/igbvf/vf.h @@ -39,6 +39,7 @@ struct e1000_hw; #define E1000_DEV_ID_82576_VF 0x10CA +#define E1000_DEV_ID_I350_VF 0x1520 #define E1000_REVISION_0 0 #define E1000_REVISION_1 1 #define E1000_REVISION_2 2 @@ -133,6 +134,7 @@ struct e1000_adv_tx_context_desc { enum e1000_mac_type { e1000_undefined = 0, e1000_vfadapt, + e1000_vfadapt_i350, e1000_num_macs /* List is 1-based, so subtract 1 for true count. */ }; |
