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/iwmc3200wifi/hal.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/iwmc3200wifi/hal.c')
| -rw-r--r-- | drivers/net/wireless/iwmc3200wifi/hal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c index 907ac890997..1cabcb39643 100644 --- a/drivers/net/wireless/iwmc3200wifi/hal.c +++ b/drivers/net/wireless/iwmc3200wifi/hal.c | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | * This is due to the fact the host talks exclusively | 57 | * This is due to the fact the host talks exclusively |
| 58 | * to the UMAC and so there needs to be a special UMAC | 58 | * to the UMAC and so there needs to be a special UMAC |
| 59 | * command for talking to the LMAC. | 59 | * command for talking to the LMAC. |
| 60 | * This is how a wifi command is layed out: | 60 | * This is how a wifi command is laid out: |
| 61 | * ------------------------ | 61 | * ------------------------ |
| 62 | * | iwm_udma_out_wifi_hdr | | 62 | * | iwm_udma_out_wifi_hdr | |
| 63 | * ------------------------ | 63 | * ------------------------ |
| @@ -72,7 +72,7 @@ | |||
| 72 | * Those commands are handled by the device's bootrom, | 72 | * Those commands are handled by the device's bootrom, |
| 73 | * and are typically sent when the UMAC and the LMAC | 73 | * and are typically sent when the UMAC and the LMAC |
| 74 | * are not yet available. | 74 | * are not yet available. |
| 75 | * * This is how a non-wifi command is layed out: | 75 | * * This is how a non-wifi command is laid out: |
| 76 | * --------------------------- | 76 | * --------------------------- |
| 77 | * | iwm_udma_out_nonwifi_hdr | | 77 | * | iwm_udma_out_nonwifi_hdr | |
| 78 | * --------------------------- | 78 | * --------------------------- |