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/pcnet32.c | |
| 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/pcnet32.c')
| -rw-r--r-- | drivers/net/pcnet32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index eb7ac4e48c71..e89afb929740 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
| @@ -1633,7 +1633,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) | |||
| 1633 | /* | 1633 | /* |
| 1634 | * On selected chips turn on the BCR18:NOUFLO bit. This stops transmit | 1634 | * On selected chips turn on the BCR18:NOUFLO bit. This stops transmit |
| 1635 | * starting until the packet is loaded. Strike one for reliability, lose | 1635 | * starting until the packet is loaded. Strike one for reliability, lose |
| 1636 | * one for latency - although on PCI this isnt a big loss. Older chips | 1636 | * one for latency - although on PCI this isn't a big loss. Older chips |
| 1637 | * have FIFO's smaller than a packet, so you can't do this. | 1637 | * have FIFO's smaller than a packet, so you can't do this. |
| 1638 | * Turn on BCR18:BurstRdEn and BCR18:BurstWrEn. | 1638 | * Turn on BCR18:BurstRdEn and BCR18:BurstWrEn. |
| 1639 | */ | 1639 | */ |