Merge tag 'v3.8-rc1' into staging/for_v3.9

[sfrench/cifs-2.6.git] / drivers / staging / media / dt3155v4l / dt3155v4l.c

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 479c643da2f61c9382709161f9064747239df569..e33b7f55d84e2a9aa8232c28463e622b0785c53c 100644 (file)
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -785,7 +785,7 @@ dt3155_init_board(struct pci_dev *pdev)
        }
        write_i2c_reg(pd->regs, CONFIG, pd->config); /*  ACQ_MODE_EVEN  */
 
-       /* select chanel 1 for input and set sync level */
+       /* select channel 1 for input and set sync level */
        write_i2c_reg(pd->regs, AD_ADDR, AD_CMD_REG);
        write_i2c_reg(pd->regs, AD_CMD, VIDEO_CNL_1 | SYNC_CNL_1 | SYNC_LVL_3);