diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/hp100.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/hp100.h')
| -rw-r--r-- | drivers/net/hp100.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hp100.h b/drivers/net/hp100.h index e6ca128a556..b60e96fe38b 100644 --- a/drivers/net/hp100.h +++ b/drivers/net/hp100.h | |||
| @@ -109,7 +109,7 @@ | |||
| 109 | #define HP100_REG_MAC_CFG_2 0x0d /* RW: (8) Misc MAC functions */ | 109 | #define HP100_REG_MAC_CFG_2 0x0d /* RW: (8) Misc MAC functions */ |
| 110 | #define HP100_REG_MAC_CFG_3 0x0e /* RW: (8) Misc MAC functions */ | 110 | #define HP100_REG_MAC_CFG_3 0x0e /* RW: (8) Misc MAC functions */ |
| 111 | #define HP100_REG_MAC_CFG_4 0x0f /* R: (8) Misc MAC states */ | 111 | #define HP100_REG_MAC_CFG_4 0x0f /* R: (8) Misc MAC states */ |
| 112 | #define HP100_REG_DROPPED 0x10 /* R: (16),11:0 Pkts cant fit in mem */ | 112 | #define HP100_REG_DROPPED 0x10 /* R: (16),11:0 Pkts can't fit in mem */ |
| 113 | #define HP100_REG_CRC 0x12 /* R: (8) Pkts with CRC */ | 113 | #define HP100_REG_CRC 0x12 /* R: (8) Pkts with CRC */ |
| 114 | #define HP100_REG_ABORT 0x13 /* R: (8) Aborted Tx pkts */ | 114 | #define HP100_REG_ABORT 0x13 /* R: (8) Aborted Tx pkts */ |
| 115 | #define HP100_REG_TRAIN_REQUEST 0x14 /* RW: (16) Endnode MAC register. */ | 115 | #define HP100_REG_TRAIN_REQUEST 0x14 /* RW: (16) Endnode MAC register. */ |