diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-26 10:01:25 -0700 |
| commit | c8b201ff867e64b6233d069563081775269f4499 (patch) | |
| tree | 35d363e6cb565fd7285480dc877a2da79eafb9a7 /drivers/net/wireless/wl12xx/wl1251_ops.c | |
| parent | 436b355b96042ab6564f43a7dabd5c61d9634ff7 (diff) | |
| parent | 249b405cf8145da8a74b70544ae1079d244bdb00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_ops.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_ops.c b/drivers/net/wireless/wl12xx/wl1251_ops.c index 96a45f595297..e7b9aab3682f 100644 --- a/drivers/net/wireless/wl12xx/wl1251_ops.c +++ b/drivers/net/wireless/wl12xx/wl1251_ops.c @@ -423,7 +423,7 @@ static void wl1251_irq_work(struct work_struct *work) wl->rx_counter = wl1251_mem_read32(wl, wl->data_path->rx_control_addr); - /* We handle a frmware bug here */ + /* We handle a firmware bug here */ switch ((wl->rx_counter - wl->rx_handled) & 0xf) { case 0: wl1251_debug(DEBUG_IRQ, "RX: FW and host in sync"); @@ -575,7 +575,7 @@ static int wl1251_hw_init_data_path_config(struct wl1251 *wl) wl->data_path = kzalloc(sizeof(struct acx_data_path_params_resp), GFP_KERNEL); if (!wl->data_path) { - wl1251_error("Couldnt allocate data path parameters"); + wl1251_error("Couldn't allocate data path parameters"); return -ENOMEM; } |