diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
| commit | f430ce6ec4c8071d358e56d531ad77bdb5cf1820 (patch) | |
| tree | 94e2d6b4d84148b7b118dfedebbbd6728dfa5547 /drivers/net/atlx/atl1.h | |
| parent | 2c68bcc9ffc5de11493f99e0ea891003f9c0a835 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
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 a5015b14a42..ffa73fc8d95 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 |