diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 09:06:09 -0400 |
| commit | e66d90fb4abd0a27ee96f57a32fb561221c4d6ae (patch) | |
| tree | 3337cba94c7444b06fdb0e8b487287d07b71f4a0 /drivers/net/niu.h | |
| parent | 55ca089e2579de90f048aca2a3030b8b2f864813 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into xen-64bit
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 12fd570b9423..c6fa883daa22 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 |