Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / staging / rt2860 / sta_ioctl.c

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 5717e12a954451612fe9fdeee7f5fe018841085c..49b1013e7a03081dc864c0a8a4574264ce995802 100644 (file)
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -2460,7 +2460,7 @@ int rt28xx_sta_ioctl(IN struct net_device *net_dev,
                }
        }
 
-       {                       /* determine this ioctl command is comming from which interface. */
+       {                       /* determine this ioctl command is coming from which interface. */
                pObj->ioctl_if_type = INT_MAIN;
                pObj->ioctl_if = MAIN_MBSSID;
        }