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 / rtmp_timer.h

diff --git a/drivers/staging/rt2860/rtmp_timer.h b/drivers/staging/rt2860/rtmp_timer.h
index 28b8ac6e835282de06475dc66bf580b9d6e504de..15b62874350033d18fb411c2eac6ffb5fb695c12 100644 (file)
--- a/drivers/staging/rt2860/rtmp_timer.h
+++ b/drivers/staging/rt2860/rtmp_timer.h
@@ -28,13 +28,14 @@
        rtmp_timer.h
 
     Abstract:
-       Ralink Wireless Driver timer related data structures and delcarations
+       Ralink Wireless Driver timer related data structures and declarations 
 
     Revision History:
-       Who           When                What
+       Who                     When                 What
        --------    ----------      ----------------------------------------------
-       Name          Date                 Modification logs
-       Shiang Tu    Aug-28-2008        init version
+       Name                    Date                 Modification logs
+       Shiang Tu               Aug-28-2008          init version
+       Justin P. Mattock       11/07/2010           Fix a typo
 
 */
 
@@ -51,8 +52,8 @@
 
 /* ----------------- Timer Related MARCO ---------------*/
 /* In some os or chipset, we have a lot of timer functions and will read/write register, */
-/*   it's not allowed in Linux USB sub-system to do it ( because of sleep issue when */
-/*  submit to ctrl pipe). So we need a wrapper function to take care it. */
+/* it's not allowed in Linux USB sub-system to do it ( because of sleep issue when */
+/* submit to ctrl pipe). So we need a wrapper function to take care it. */
 
 #ifdef RTMP_TIMER_TASK_SUPPORT
 typedef void(*RTMP_TIMER_TASK_HANDLE) (void *SystemSpecific1,