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/rx.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/rx.c')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 84866a4b835..ec21ea9fd8d 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c | |||
| @@ -849,7 +849,7 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) | |||
| 849 | /* | 849 | /* |
| 850 | * nested carl9170_rx_stream call! | 850 | * nested carl9170_rx_stream call! |
| 851 | * | 851 | * |
| 852 | * termination is guranteed, even when the | 852 | * termination is guaranteed, even when the |
| 853 | * combined frame also have an element with | 853 | * combined frame also have an element with |
| 854 | * a bad tag. | 854 | * a bad tag. |
| 855 | */ | 855 | */ |