Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-beck.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 1abdc7d9c7442e579d01be35113e7d2d9017626b..4a574f3cfb2f8d72c2fe589b00e65eac7317b466 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