diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/niu.h | |
| parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
| parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 97ffbe137bcb..101a3f1a8ec8 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
| @@ -281,7 +281,7 @@ | |||
| 281 | #define XMAC_ADDR1 0x000a8UL | 281 | #define XMAC_ADDR1 0x000a8UL |
| 282 | #define XMAC_ADDR1_ADDR1 0x000000000000ffffULL | 282 | #define XMAC_ADDR1_ADDR1 0x000000000000ffffULL |
| 283 | 283 | ||
| 284 | #define XMAC_ADDR2 0x000b0UL | 284 | #define XMAC_ADDR2 0x000b0UL |
| 285 | #define XMAC_ADDR2_ADDR2 0x000000000000ffffULL | 285 | #define XMAC_ADDR2_ADDR2 0x000000000000ffffULL |
| 286 | 286 | ||
| 287 | #define XMAC_ADDR_CMPEN 0x00208UL | 287 | #define XMAC_ADDR_CMPEN 0x00208UL |