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/wireless/ath/carl9170/usb.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/wireless/ath/carl9170/usb.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index f82c400be28..2fb53d06751 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c | |||
| @@ -430,7 +430,7 @@ static void carl9170_usb_rx_complete(struct urb *urb) | |||
| 430 | * The system is too slow to cope with | 430 | * The system is too slow to cope with |
| 431 | * the enormous workload. We have simply | 431 | * the enormous workload. We have simply |
| 432 | * run out of active rx urbs and this | 432 | * run out of active rx urbs and this |
| 433 | * unfortunatly leads to an unpredictable | 433 | * unfortunately leads to an unpredictable |
| 434 | * device. | 434 | * device. |
| 435 | */ | 435 | */ |
| 436 | 436 | ||