aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/hal.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/net/wireless/iwmc3200wifi/hal.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/hal.c')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/hal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c
index c430418248b4..d13c8853ee82 100644
--- a/drivers/net/wireless/iwmc3200wifi/hal.c
+++ b/drivers/net/wireless/iwmc3200wifi/hal.c
@@ -411,7 +411,7 @@ static void iwm_build_lmac_hdr(struct iwm_priv *iwm, struct iwm_lmac_hdr *hdr,
411/* 411/*
412 * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC. 412 * iwm_hal_send_host_cmd(): sends commands to the UMAC or the LMAC.
413 * Sending command to the LMAC is equivalent to sending a 413 * Sending command to the LMAC is equivalent to sending a
414 * regular UMAC command with the LMAC passtrough or the LMAC 414 * regular UMAC command with the LMAC passthrough or the LMAC
415 * wrapper UMAC command IDs. 415 * wrapper UMAC command IDs.
416 */ 416 */
417int iwm_hal_send_host_cmd(struct iwm_priv *iwm, 417int iwm_hal_send_host_cmd(struct iwm_priv *iwm,