diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-30 23:50:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-30 23:50:18 -0700 |
| commit | 194dcdba5a11a0238aef7ed91f32df77cb31505b (patch) | |
| tree | ad9b2e763d702ab59d176f3acc57dbb200afdad1 /drivers/net/atlx/atl1.h | |
| parent | 19b8cba2e8539e3b8022316f94837d8f242b8f80 (diff) | |
| parent | bdb59f949d663b7e943fb5f40b2557af4314abf9 (diff) | |
Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/atlx/atl1.h')
| -rw-r--r-- | drivers/net/atlx/atl1.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h index a5015b14a429..ffa73fc8d95e 100644 --- a/drivers/net/atlx/atl1.h +++ b/drivers/net/atlx/atl1.h @@ -504,7 +504,7 @@ struct rx_free_desc { #define TPD_PKTNT_MASK 0x0001 #define TPD_PKTINT_SHIFT 15 #define TPD_VLANTAG_MASK 0xFFFF -#define TPD_VLAN_SHIFT 16 +#define TPD_VLANTAG_SHIFT 16 /* tpd word 3 bits 0:13 */ #define TPD_EOP_MASK 0x0001 |