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/bcm63xx_enet.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/bcm63xx_enet.c')
| -rw-r--r-- | drivers/net/bcm63xx_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index 2af413fbfb0e..e68ffe622e69 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
| @@ -597,7 +597,7 @@ static int bcm_enet_set_mac_address(struct net_device *dev, void *p) | |||
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | /* | 599 | /* |
| 600 | * Change rx mode (promiscous/allmulti) and update multicast list | 600 | * Change rx mode (promiscuous/allmulti) and update multicast list |
| 601 | */ | 601 | */ |
| 602 | static void bcm_enet_set_multicast_list(struct net_device *dev) | 602 | static void bcm_enet_set_multicast_list(struct net_device *dev) |
| 603 | { | 603 | { |