diff for duplicates of <87wpsctxjv.wl%kuninori.morimoto.gx@renesas.com>
diff --git a/a/1.txt b/N1/1.txt
index 87dbc0e..a1a1b98 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -173,7 +173,7 @@ index 30602f2..e92f29b 100644
goto error_unregister;
- priv->zone = thermal_zone_device_register("rcar_thermal",
-+ if (of_data = USE_OF_THERMAL)
++ if (of_data == USE_OF_THERMAL)
+ priv->zone = thermal_zone_of_sensor_register(
+ dev, i, priv,
+ &rcar_thermal_zone_of_ops);
diff --git a/a/content_digest b/N1/content_digest
index f574296..fd47930 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -24,9 +24,9 @@
" Zhang Rui <rui.zhang\@intel.com>",
" Geert Uytterhoeven <geert\@linux-m68k.org>",
" Magnus <magnus.damm\@gmail.com>",
- " linux-sh\@vger.kernel.org",
- " linux-pm\@vger.kernel.org",
- " linux-kernel\@vger.kernel.org",
+ " <linux-sh\@vger.kernel.org>",
+ " <linux-pm\@vger.kernel.org>",
+ " <linux-kernel\@vger.kernel.org>",
" devicetree\@vger.kernel.org <devicetree\@vger.kernel.org>\0"
]
[
@@ -211,7 +211,7 @@
" \t\t\tgoto error_unregister;\n",
" \n",
"-\t\tpriv->zone = thermal_zone_device_register(\"rcar_thermal\",\n",
- "+\t\tif (of_data = USE_OF_THERMAL)\n",
+ "+\t\tif (of_data == USE_OF_THERMAL)\n",
"+\t\t\tpriv->zone = thermal_zone_of_sensor_register(\n",
"+\t\t\t\t\t\tdev, i, priv,\n",
"+\t\t\t\t\t\t&rcar_thermal_zone_of_ops);\n",
@@ -225,4 +225,4 @@
"1.9.1"
]
-4f2427c9932b01ab43663eb7a8cb9159d37b29c8b11badb40c1a4a84ee3f2f6e
+3f1d59d3605670e3ed45da4eb12fa17aa5a4d709c9af785704e541dda18eb1c9
diff --git a/a/1.txt b/N2/1.txt
index 87dbc0e..a1a1b98 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -173,7 +173,7 @@ index 30602f2..e92f29b 100644
goto error_unregister;
- priv->zone = thermal_zone_device_register("rcar_thermal",
-+ if (of_data = USE_OF_THERMAL)
++ if (of_data == USE_OF_THERMAL)
+ priv->zone = thermal_zone_of_sensor_register(
+ dev, i, priv,
+ &rcar_thermal_zone_of_ops);
diff --git a/a/content_digest b/N2/content_digest
index f574296..9127cc9 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -211,7 +211,7 @@
" \t\t\tgoto error_unregister;\n",
" \n",
"-\t\tpriv->zone = thermal_zone_device_register(\"rcar_thermal\",\n",
- "+\t\tif (of_data = USE_OF_THERMAL)\n",
+ "+\t\tif (of_data == USE_OF_THERMAL)\n",
"+\t\t\tpriv->zone = thermal_zone_of_sensor_register(\n",
"+\t\t\t\t\t\tdev, i, priv,\n",
"+\t\t\t\t\t\t&rcar_thermal_zone_of_ops);\n",
@@ -225,4 +225,4 @@
"1.9.1"
]
-4f2427c9932b01ab43663eb7a8cb9159d37b29c8b11badb40c1a4a84ee3f2f6e
+4207b523213b23c59dcfac9d8690e0d39cafd725ab13e31f63dce7f17dad9965
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.