Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6

* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
  Fix common misspellings

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index ecfd9fb167d8..5991ab60303d 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -352,7 +352,7 @@ static void send_tasklet(unsigned long arg)
         if (!atomic_read(&fmdev->tx_cnt))
                 return;
 
-        /* Check, is there any timeout happenned to last transmitted packet */
+        /* Check, is there any timeout happened to last transmitted packet */
         if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) {
                 fmerr("TX timeout occurred\n");
                 atomic_set(&fmdev->tx_cnt, 1);
@@ -478,7 +478,7 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,
                 return -ETIMEDOUT;
         }
         if (!fmdev->resp_skb) {
-                fmerr("Reponse SKB is missing\n");
+                fmerr("Response SKB is missing\n");
                 return -EFAULT;
         }
         spin_lock_irqsave(&fmdev->resp_skb_lock, flags);
@@ -1598,7 +1598,7 @@ u32 fmc_release(struct fmdev *fmdev)
                 fmdbg("FM Core is already down\n");
                 return 0;
         }
-        /* Sevice pending read */
+        /* Service pending read */
         wake_up_interruptible(&fmdev->rx.rds.read_queue);
 
         tasklet_kill(&fmdev->tx_task);
diff --git a/drivers/media/radio/wl128x/fmdrv_common.h b/drivers/media/radio/wl128x/fmdrv_common.h
index 427c4164cece..aee243bb6630 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.h
+++ b/drivers/media/radio/wl128x/fmdrv_common.h
@@ -362,7 +362,7 @@ struct fm_event_msg_hdr {
 #define FM_TX_PREEMPH_50US              0
 #define FM_TX_PREEMPH_75US              2
 
-/* FM TX antenna impedence values */
+/* FM TX antenna impedance values */
 #define FM_TX_ANT_IMP_50                0
 #define FM_TX_ANT_IMP_200               1
 #define FM_TX_ANT_IMP_500               2