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/benet/be_cmds.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/benet/be_cmds.c')
| -rw-r--r-- | drivers/net/benet/be_cmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 2aadf88eaa0..11b774a5eaf 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c | |||
| @@ -1438,7 +1438,7 @@ err: | |||
| 1438 | 1438 | ||
| 1439 | /* | 1439 | /* |
| 1440 | * Uses MCC for this command as it may be called in BH context | 1440 | * Uses MCC for this command as it may be called in BH context |
| 1441 | * (mc == NULL) => multicast promiscous | 1441 | * (mc == NULL) => multicast promiscuous |
| 1442 | */ | 1442 | */ |
| 1443 | int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id, | 1443 | int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id, |
| 1444 | struct net_device *netdev, struct be_dma_mem *mem) | 1444 | struct net_device *netdev, struct be_dma_mem *mem) |