Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / rt_pci_rbus.c

diff --git a/drivers/staging/rt2860/rt_pci_rbus.c b/drivers/staging/rt2860/rt_pci_rbus.c
index 3004be6da003085e2e6907e22bdaea57221b28d7..e5fb67cd9a688e10a56c1605234e61dde8d419e5 100644 (file)
--- a/drivers/staging/rt2860/rt_pci_rbus.c
+++ b/drivers/staging/rt2860/rt_pci_rbus.c
@@ -31,7 +31,8 @@
     Create and register network interface.
 
     Revision History:
-    Who         When            What
+    Who                When            What
+    Justin P. Mattock  11/07/2010      Fix a typo
     --------    ----------      ----------------------------------------------
 */
 
@@ -356,7 +357,7 @@ static void mgmt_dma_done_tasklet(unsigned long data)
 
        RTMPHandleMgmtRingDmaDoneInterrupt(pAd);
 
-       /* if you use RTMP_SEM_LOCK, sometimes kernel will hang up, no any */
+       /* if you use RTMP_SEM_LOCK, sometimes kernel will hang up, without any */
        /* bug report output */
        RTMP_INT_LOCK(&pAd->irq_lock, flags);
        /*
@@ -787,7 +788,7 @@ IRQ_HANDLE_TYPE rt2860_interrupt(int irq, void *dev_instance)
 }
 
 /*
- * invaild or writeback cache
+ * invalid or writeback cache
  * and convert virtual address to physical address
  */
 dma_addr_t linux_pci_map_single(struct rt_rtmp_adapter *pAd, void *ptr,