Merge branch 'master' into for-next

[linux-imx.git] / drivers / media / platform / soc_camera / mx2_camera.c

diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 8bda2c908aba3b17aa53dc44f96474aca76a284f..5cc55f333f84c75caf862aa494210589ba72a26c 100644 (file)
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -345,7 +345,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
        /*
         * This is a generic configuration which is valid for most
         * prp input-output format combinations.
-        * We set the incomming and outgoing pixelformat to a
+        * We set the incoming and outgoing pixelformat to a
         * 16 Bit wide format and adjust the bytesperline
         * accordingly. With this configuration the inputdata
         * will not be changed by the emma and could be any type