diff for duplicates of <20090302150426.b22100c1.akpm@linux-foundation.org>

diff --git a/a/1.txt b/N1/1.txt
index fea321e..8ee615f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ On Mon, 2 Mar 2009 13:01:06 -0800
 "Darrick J. Wong" <djwong@us.ibm.com> wrote:
 
 > @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind,
->  			 && (reg_config1 & 0x3f) = 0x00
+>  			 && (reg_config1 & 0x3f) == 0x00
 >  			 && reg_convrate <= 0x07) {
 >  				kind = max6646;
 > -			}
@@ -10,7 +10,7 @@ On Mon, 2 Mar 2009 13:01:06 -0800
 > +			/* The MAX6648/6692 chips have a working man/chip id
 > +			 * and the same register set as the 6657.
 > +			 */
-> +			if (chip_id = 0x59 && address = 0x4C)
+> +			if (chip_id == 0x59 && address == 0x4C)
 > +				kind = max6657;
 >  		}
 
@@ -20,15 +20,15 @@ gack, the indenting and layout there is totally busted.
 --- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix
 +++ a/drivers/hwmon/lm90.c
 @@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client
- 			 && (reg_config1 & 0x3f) = 0x00
+ 			 && (reg_config1 & 0x3f) == 0x00
  			 && reg_convrate <= 0x07) {
  				kind = max6646;
 -			} else
 -			/* The MAX6648/6692 chips have a working man/chip id
 -			 * and the same register set as the 6657.
 -			 */
--			if (chip_id = 0x59 && address = 0x4C)
-+			} else if (chip_id = 0x59 && address = 0x4C) {
+-			if (chip_id == 0x59 && address == 0x4C)
++			} else if (chip_id == 0x59 && address == 0x4C) {
 +				/*
 +				 * The MAX6648/6692 chips have a working
 +				 * man/chip id and the same register set as the
@@ -40,9 +40,3 @@ gack, the indenting and layout there is totally busted.
  
  		if (kind <= 0) { /* identification failed */
 _
-
-
-_______________________________________________
-lm-sensors mailing list
-lm-sensors@lm-sensors.org
-http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
diff --git a/a/content_digest b/N1/content_digest
index 67becf0..a536fea 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020090302210106.GD6550@plum\0"
  "From\0Andrew Morton <akpm@linux-foundation.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH] lm90: Support the MAX6648/6692 chips\0"
- "Date\0Mon, 02 Mar 2009 23:04:26 +0000\0"
+ "Subject\0Re: [PATCH] lm90: Support the MAX6648/6692 chips\0"
+ "Date\0Mon, 2 Mar 2009 15:04:26 -0800\0"
  "To\0djwong@us.ibm.com\0"
  "Cc\0khali@linux-fr.org"
   linux-kernel@vger.kernel.org
@@ -12,7 +12,7 @@
  "\"Darrick J. Wong\" <djwong@us.ibm.com> wrote:\n"
  "\n"
  "> @@ -776,7 +776,12 @@ static int lm90_detect(struct i2c_client *new_client, int kind,\n"
- ">  \t\t\t && (reg_config1 & 0x3f) = 0x00\n"
+ ">  \t\t\t && (reg_config1 & 0x3f) == 0x00\n"
  ">  \t\t\t && reg_convrate <= 0x07) {\n"
  ">  \t\t\t\tkind = max6646;\n"
  "> -\t\t\t}\n"
@@ -20,7 +20,7 @@
  "> +\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n"
  "> +\t\t\t * and the same register set as the 6657.\n"
  "> +\t\t\t */\n"
- "> +\t\t\tif (chip_id = 0x59 && address = 0x4C)\n"
+ "> +\t\t\tif (chip_id == 0x59 && address == 0x4C)\n"
  "> +\t\t\t\tkind = max6657;\n"
  ">  \t\t}\n"
  "\n"
@@ -30,15 +30,15 @@
  "--- a/drivers/hwmon/lm90.c~lm90-support-the-max6648-6692-chips-fix\n"
  "+++ a/drivers/hwmon/lm90.c\n"
  "@@ -776,12 +776,14 @@ static int lm90_detect(struct i2c_client\n"
- " \t\t\t && (reg_config1 & 0x3f) = 0x00\n"
+ " \t\t\t && (reg_config1 & 0x3f) == 0x00\n"
  " \t\t\t && reg_convrate <= 0x07) {\n"
  " \t\t\t\tkind = max6646;\n"
  "-\t\t\t} else\n"
  "-\t\t\t/* The MAX6648/6692 chips have a working man/chip id\n"
  "-\t\t\t * and the same register set as the 6657.\n"
  "-\t\t\t */\n"
- "-\t\t\tif (chip_id = 0x59 && address = 0x4C)\n"
- "+\t\t\t} else if (chip_id = 0x59 && address = 0x4C) {\n"
+ "-\t\t\tif (chip_id == 0x59 && address == 0x4C)\n"
+ "+\t\t\t} else if (chip_id == 0x59 && address == 0x4C) {\n"
  "+\t\t\t\t/*\n"
  "+\t\t\t\t * The MAX6648/6692 chips have a working\n"
  "+\t\t\t\t * man/chip id and the same register set as the\n"
@@ -49,12 +49,6 @@
  " \t\t}\n"
  " \n"
  " \t\tif (kind <= 0) { /* identification failed */\n"
- "_\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ _
 
-42c26792f10643f5dfb68bfa78685f2bb86398b131efa0214a7ec311f9153a63
+c318883280c1f27876228bba27c84ac39c62aae1b697b00aec50dd974a88537b
