Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-flexiantxendom0-natty.git] / drivers / net / wireless / iwmc3200wifi / rx.c

diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c
index 72c27a3..1c57c1f 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/rx.c
+++ b/drivers/net/wireless/iwmc3200wifi/rx.c
@@ -1578,7 +1578,7 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm,
                kfree_skb(packet->skb);
                break;
        default:
-               IWM_ERR(iwm, "Unknow ticket action: %d\n",
+               IWM_ERR(iwm, "Unknown ticket action: %d\n",
                        le16_to_cpu(ticket_node->ticket->action));
                kfree_skb(packet->skb);
        }