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

[karo-tx-linux.git] / drivers / staging / westbridge / astoria / api / src / cyasmisc.c

diff --git a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
index 7852410b0a4c30c009e1e6576a0ea52dc815a805..4564fc11df226f45fb394b41df2b7d6990d3c65f 100644 (file)
--- a/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
+++ b/drivers/staging/westbridge/astoria/api/src/cyasmisc.c
@@ -428,7 +428,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context,
                                if (v & CY_AS_MEM_P0_VM_SET_CFGMODE)
                                        cy_as_hal_print_message(
                                        "initialization message "
-                                       "recieved, but config bit "
+                                       "received, but config bit "
                                        "still set\n");
 
                                v = cy_as_hal_read_register(dev_p->tag,
@@ -436,7 +436,7 @@ my_misc_callback(cy_as_device *dev_p, uint8_t context,
                                if ((v & CY_AS_MEM_RST_RSTCMPT) == 0)
                                        cy_as_hal_print_message(
                                        "initialization message "
-                                       "recieved, but reset complete "
+                                       "received, but reset complete "
                                        "bit still not set\n");
                        }
                        break;
@@ -2381,7 +2381,7 @@ try_wakeup_again:
        /*
         * release the west bridge micro-_controller from reset,
         * so that firmware initialization can complete. the attempt
-        * to release antioch reset is made upto 8 times.
+        * to release antioch reset is made up to 8 times.
         */
        v = 0x03;
        count = 0x08;