summaryrefslogtreecommitdiff
path: root/drivers/net/niu.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-13 01:19:43 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-13 01:19:43 -0700
commit99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch)
tree4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/niu.h
parent7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff)
parent7d2e3cb7000b883a8e489485ac249be572fe17b1 (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.h2
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 @@
#define XMAC_ADDR1 0x000a8UL
#define XMAC_ADDR1_ADDR1 0x000000000000ffffULL
-#define XMAC_ADDR2 0x000b0UL
+#define XMAC_ADDR2 0x000b0UL
#define XMAC_ADDR2_ADDR2 0x000000000000ffffULL
#define XMAC_ADDR_CMPEN 0x00208UL