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

[karo-tx-linux.git] / drivers / staging / rtl8187se / r8180_rtl8225z2.c

diff --git a/drivers/staging/rtl8187se/r8180_rtl8225z2.c b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
index 2a2afd51cf42a7a5413c7f367c27e9f903b4b586..3f09f76080afc6fa3ca997f747479aaf538c02bf 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_rtl8225z2.c
+++ b/drivers/staging/rtl8187se/r8180_rtl8225z2.c
@@ -378,7 +378,7 @@ static u32 read_rtl8225(struct net_device *dev, u8 adr)
        mask = (low2high) ? 0x01 : (((u32)0x01) << (12-1));
 
        /*
-        * We must set data pin to HW controled, otherwise RF can't driver it
+        * We must set data pin to HW controlled, otherwise RF can't driver it
         * and value RF register won't be able to read back properly.
         */
        write_nic_word(dev, RFPinsEnable, (oval2 & (~0x01)));