Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / media / video / cx23885 / cimax2.c

diff --git a/drivers/media/video/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c
index 209b971..c9f15d6 100644 (file)
--- a/drivers/media/video/cx23885/cimax2.c
+++ b/drivers/media/video/cx23885/cimax2.c
@@ -449,7 +449,7 @@ int netup_ci_init(struct cx23885_tsport *port)
                0x04, /* ack active low */
                0x00, /* LOCK = 0 */
                0x33, /* serial mode, rising in, rising out, MSB first*/
-               0x31, /* syncronization */
+               0x31, /* synchronization */
        };
        int ret;