diff for duplicates of <4223513F.4030403@katalix.com> diff --git a/a/1.txt b/N1/1.txt index b014e8c..8a9224d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,42 +1,3 @@ Add ADT7461 (temperature sensor) support to LM90 driver. Signed-off-by: James Chapman <jchapman@katalix.com> - - - - - --------------- next part -------------- -diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c ---- a/drivers/i2c/chips/lm90.c 2005-02-27 13:24:11 +00:00 -+++ b/drivers/i2c/chips/lm90.c 2005-02-27 13:24:11 +00:00 -@@ -85,7 +85,7 @@ - * Insmod parameters - */ - --SENSORS_INSMOD_5(lm90, adm1032, lm99, lm86, max6657); -+SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461); - - /* - * The LM90 registers -@@ -386,7 +386,10 @@ - && (reg_config1 & 0x3F) = 0x00 - && reg_convrate <= 0x0A) { - kind = adm1032; -- } -+ } else -+ if (address = 0x4c -+ && chip_id = 0x51) /* ADT7461 */ -+ kind = adt7461; - } else - if (man_id = 0x4D) { /* Maxim */ - /* -@@ -423,6 +426,8 @@ - name = "lm86"; - } else if (kind = max6657) { - name = "max6657"; -+ } else if (kind = adt7461) { -+ name = "adt7461"; - } - - /* We can fill in the remaining client fields */ diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..5d9580c --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; + name="lm90.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="lm90.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..906e7fc --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,33 @@ +diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c +--- a/drivers/i2c/chips/lm90.c 2005-02-27 13:24:11 +00:00 ++++ b/drivers/i2c/chips/lm90.c 2005-02-27 13:24:11 +00:00 +@@ -85,7 +85,7 @@ + * Insmod parameters + */ + +-SENSORS_INSMOD_5(lm90, adm1032, lm99, lm86, max6657); ++SENSORS_INSMOD_6(lm90, adm1032, lm99, lm86, max6657, adt7461); + + /* + * The LM90 registers +@@ -386,7 +386,10 @@ + && (reg_config1 & 0x3F) == 0x00 + && reg_convrate <= 0x0A) { + kind = adm1032; +- } ++ } else ++ if (address == 0x4c ++ && chip_id == 0x51) /* ADT7461 */ ++ kind = adt7461; + } else + if (man_id == 0x4D) { /* Maxim */ + /* +@@ -423,6 +426,8 @@ + name = "lm86"; + } else if (kind == max6657) { + name = "max6657"; ++ } else if (kind == adt7461) { ++ name = "adt7461"; + } + + /* We can fill in the remaining client fields */ diff --git a/a/content_digest b/N1/content_digest index 7b447c0..56c20b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,17 @@ - "From\0jchapman@katalix.com (James Chapman)\0" + "From\0James Chapman <jchapman@katalix.com>\0" "Subject\0[PATCH: 2.6.11-rc5] i2c chips: add adt7461 support to lm90 driver\0" - "Date\0Thu, 19 May 2005 06:25:40 +0000\0" + "Date\0Mon, 28 Feb 2005 17:13:35 +0000\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0linux-kernel@vger.kernel.org" " khali@linux-fr.org\0" - "\00:1\0" + "\01:1\0" "b\0" "Add ADT7461 (temperature sensor) support to LM90 driver.\n" "\n" - "Signed-off-by: James Chapman <jchapman@katalix.com>\n" - "\n" - "\n" - "\n" - "\n" - "\n" - "-------------- next part --------------\n" + Signed-off-by: James Chapman <jchapman@katalix.com> + "\01:2\0" + "fn\0lm90.patch\0" + "b\0" "diff -Nru a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c\n" "--- a/drivers/i2c/chips/lm90.c\t2005-02-27 13:24:11 +00:00\n" "+++ b/drivers/i2c/chips/lm90.c\t2005-02-27 13:24:11 +00:00\n" @@ -28,25 +25,25 @@ " /*\n" " * The LM90 registers\n" "@@ -386,7 +386,10 @@\n" - " \t\t\t && (reg_config1 & 0x3F) = 0x00\n" + " \t\t\t && (reg_config1 & 0x3F) == 0x00\n" " \t\t\t && reg_convrate <= 0x0A) {\n" " \t\t\t\tkind = adm1032;\n" "-\t\t\t}\n" "+\t\t\t} else\n" - "+\t\t\tif (address = 0x4c\n" - "+\t\t\t && chip_id = 0x51) /* ADT7461 */\n" + "+\t\t\tif (address == 0x4c\n" + "+\t\t\t && chip_id == 0x51) /* ADT7461 */\n" "+\t\t\t\tkind = adt7461;\n" " \t\t} else\n" - " \t\tif (man_id = 0x4D) { /* Maxim */\n" + " \t\tif (man_id == 0x4D) { /* Maxim */\n" " \t\t\t/*\n" "@@ -423,6 +426,8 @@\n" " \t\tname = \"lm86\";\n" - " \t} else if (kind = max6657) {\n" + " \t} else if (kind == max6657) {\n" " \t\tname = \"max6657\";\n" - "+\t} else if (kind = adt7461) {\n" + "+\t} else if (kind == adt7461) {\n" "+\t\tname = \"adt7461\";\n" " \t}\n" " \n" " \t/* We can fill in the remaining client fields */" -16bbce3ce7fbb644137f13443397c654e88caff570bfbd263c1c6ef6f45b5bc7 +39a37246be7f346a466fa6024452edf899f0c4850b92e882fd0e40ed33457850
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.