Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[mirror_ubuntu-bionic-kernel.git] / drivers / media / video / cx231xx / cx231xx-avcore.c

diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 98e876553824c79eaa89438285512e2ff2b085e3..8d7813415760e5f1cf753368f86b0f124e642b55 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2577,7 +2577,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
                        break;
 
                case 6: /* ts1 parallel mode */
-                       cx231xx_info("%s: set ts1 parrallel mode registers\n",
+                       cx231xx_info("%s: set ts1 parallel mode registers\n",
                                     __func__);
                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
                        status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);