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/pcmcia/axnet_cs.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/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index d3cb77205863..3077d72e8222 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -780,7 +780,7 @@ module_exit(exit_axnet_cs); | |||
780 | Alexey Kuznetsov : use the 8390's six bit hash multicast filter. | 780 | Alexey Kuznetsov : use the 8390's six bit hash multicast filter. |
781 | Paul Gortmaker : tweak ANK's above multicast changes a bit. | 781 | Paul Gortmaker : tweak ANK's above multicast changes a bit. |
782 | Paul Gortmaker : update packet statistics for v2.1.x | 782 | Paul Gortmaker : update packet statistics for v2.1.x |
783 | Alan Cox : support arbitary stupid port mappings on the | 783 | Alan Cox : support arbitrary stupid port mappings on the |
784 | 68K Macintosh. Support >16bit I/O spaces | 784 | 68K Macintosh. Support >16bit I/O spaces |
785 | Paul Gortmaker : add kmod support for auto-loading of the 8390 | 785 | Paul Gortmaker : add kmod support for auto-loading of the 8390 |
786 | module by all drivers that require it. | 786 | module by all drivers that require it. |
@@ -842,7 +842,7 @@ static void do_set_multicast_list(struct net_device *dev); | |||
842 | /* | 842 | /* |
843 | * SMP and the 8390 setup. | 843 | * SMP and the 8390 setup. |
844 | * | 844 | * |
845 | * The 8390 isnt exactly designed to be multithreaded on RX/TX. There is | 845 | * The 8390 isn't exactly designed to be multithreaded on RX/TX. There is |
846 | * a page register that controls bank and packet buffer access. We guard | 846 | * a page register that controls bank and packet buffer access. We guard |
847 | * this with ei_local->page_lock. Nobody should assume or set the page other | 847 | * this with ei_local->page_lock. Nobody should assume or set the page other |
848 | * than zero when the lock is not held. Lock holders must restore page 0 | 848 | * than zero when the lock is not held. Lock holders must restore page 0 |