diff for duplicates of <2370627.KrZrtTfMjV@avalon> diff --git a/a/1.txt b/N1/1.txt index 0506ca3..5efbefe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,12 +37,13 @@ Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > dmr = 0; > break; > case V4L2_PIX_FMT_RGB32: -> - if (priv->chip = RCAR_H2 || priv->chip = RCAR_H1 || -> + if (priv->chip = RCAR_GEN2 || priv->chip = RCAR_H1 || -> priv->chip = RCAR_E1) { +> - if (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 || +> + if (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 || +> priv->chip == RCAR_E1) { > dmr = VNDMR_EXRGB; > break; -> @@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops > { }; +> @@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops = +> { }; > > static struct platform_device_id rcar_vin_id_table[] = { > - { "r8a7790-vin", RCAR_H2 }, diff --git a/a/content_digest b/N1/content_digest index 421b814..232f7f6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01388071909-12207-1-git-send-email-valentine.barshak@cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH V2] media: soc_camera: rcar_vin: Add preliminary R-Car M2 support\0" - "Date\0Thu, 26 Dec 2013 23:38:11 +0000\0" + "Date\0Fri, 27 Dec 2013 00:38:11 +0100\0" "To\0Valentine Barshak <valentine.barshak@cogentembedded.com>\0" "Cc\0linux-sh@vger.kernel.org" linux-media@vger.kernel.org @@ -52,12 +52,13 @@ "> \t\tdmr = 0;\n" "> \t\tbreak;\n" "> \tcase V4L2_PIX_FMT_RGB32:\n" - "> -\t\tif (priv->chip = RCAR_H2 || priv->chip = RCAR_H1 ||\n" - "> +\t\tif (priv->chip = RCAR_GEN2 || priv->chip = RCAR_H1 ||\n" - "> \t\t priv->chip = RCAR_E1) {\n" + "> -\t\tif (priv->chip == RCAR_H2 || priv->chip == RCAR_H1 ||\n" + "> +\t\tif (priv->chip == RCAR_GEN2 || priv->chip == RCAR_H1 ||\n" + "> \t\t priv->chip == RCAR_E1) {\n" "> \t\t\tdmr = VNDMR_EXRGB;\n" "> \t\t\tbreak;\n" - "> @@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops > { };\n" + "> @@ -1384,7 +1384,8 @@ static struct soc_camera_host_ops rcar_vin_host_ops =\n" + "> { };\n" "> \n" "> static struct platform_device_id rcar_vin_id_table[] = {\n" "> -\t{ \"r8a7790-vin\", RCAR_H2 },\n" @@ -71,4 +72,4 @@ "\n" Laurent Pinchart -e01e623fde119d00473b876a5f03157b94c99f922d6b6b07d8799100aa6dd867 +d89779d84c210b4cbb16ecf162bac20ac8cf2cf9e9a9b9fd1e2cc6b3f250ba9a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.