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/gianfar.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/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 57ee3b009d75..0438d3551d5c 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -1026,7 +1026,7 @@ enum gfar_errata { | |||
| 1026 | }; | 1026 | }; |
| 1027 | 1027 | ||
| 1028 | /* Struct stolen almost completely (and shamelessly) from the FCC enet source | 1028 | /* Struct stolen almost completely (and shamelessly) from the FCC enet source |
| 1029 | * (Ok, that's not so true anymore, but there is a family resemblence) | 1029 | * (Ok, that's not so true anymore, but there is a family resemblance) |
| 1030 | * The GFAR buffer descriptors track the ring buffers. The rx_bd_base | 1030 | * The GFAR buffer descriptors track the ring buffers. The rx_bd_base |
| 1031 | * and tx_bd_base always point to the currently available buffer. | 1031 | * and tx_bd_base always point to the currently available buffer. |
| 1032 | * The dirty_tx tracks the current buffer that is being sent by the | 1032 | * The dirty_tx tracks the current buffer that is being sent by the |