diff for duplicates of <20100915132029.4c708c7d@hyperion.delvare>

diff --git a/a/1.txt b/N1/1.txt
index f3c6108..2dbc32d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -327,7 +327,7 @@ with data->update_lock held.
 > +{
 > +	u8 config;
 > +
-> +	if (data->kind = max6695) {
+> +	if (data->kind == max6695) {
 > +		lm90_read_reg(client, LM90_REG_R_CONFIG1, &config);
 > +		config &= ~0x08;
 > +		if (channel)
@@ -343,7 +343,7 @@ with data->update_lock held.
 > @@ -786,6 +888,23 @@ static int lm90_detect(struct i2c_client *new_client,
 >  		}
 >  	} else
->  	if (man_id = 0x4D) { /* Maxim */
+>  	if (man_id == 0x4D) { /* Maxim */
 > +		int reg_emerg, reg_emerg2, reg_status2;
 > +
 > +		/*
@@ -378,10 +378,10 @@ with data->update_lock held.
 > +		 * limit registers. We can detect those chips by checking if
 > +		 * one of those registers exists.
 > +		 */
-> +		if (chip_id = 0x01
-> +		 && (reg_config1 & 0x10) = 0x00
-> +		 && (reg_status2 & 0x01) = 0x00
-> +		 && reg_emerg = reg_emerg2
+> +		if (chip_id == 0x01
+> +		 && (reg_config1 & 0x10) == 0x00
+> +		 && (reg_status2 & 0x01) == 0x00
+> +		 && reg_emerg == reg_emerg2
 > +		 && reg_convrate <= 0x07) {
 > +			name = "max6695";
 > +		} else
@@ -419,9 +419,9 @@ with data->update_lock held.
 > +	    && data->kind != max6646 && data->kind != max6695)
 >  		data->flags |= LM90_HAVE_OFFSET;
 >  
->  	if (data->kind = max6657 || data->kind = max6659
-> -	    || data->kind = max6646)
-> +	    || data->kind = max6646 || data->kind = max6695)
+>  	if (data->kind == max6657 || data->kind == max6659
+> -	    || data->kind == max6646)
+> +	    || data->kind == max6646 || data->kind == max6695)
 >  		data->flags |= LM90_HAVE_LOCAL_EXT;
 >  
 >  	if (data->kind != max6657 && data->kind != max6659
@@ -430,11 +430,11 @@ with data->update_lock held.
 > +	    && data->kind != max6695)
 >  		data->flags |= LM90_HAVE_REM_LIMIT_EXT;
 >  
-> -	if (data->kind = max6659)
-> +	if (data->kind = max6659 || data->kind = max6695)
+> -	if (data->kind == max6659)
+> +	if (data->kind == max6659 || data->kind == max6695)
 >  		data->flags |= LM90_HAVE_EMERGENCY;
 >  
-> +	if (data->kind = max6695)
+> +	if (data->kind == max6695)
 > +		data->flags |= LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3;
 > +
 >  	/* Initialize the LM90 chip */
@@ -460,13 +460,13 @@ with data->update_lock held.
 >  	data->hwmon_dev = hwmon_device_register(&new_client->dev);
 >  	if (IS_ERR(data->hwmon_dev)) {
 > @@ -985,6 +1146,12 @@ static void lm90_init_client(struct i2c_client *client)
->  	if (data->kind = max6680)
+>  	if (data->kind == max6680)
 >  		config |= 0x18;
 >  
 > +	/*
 > +	 * Select external channel 1 for max6695
 > +	 */
-> +	if (data->kind = max6695)
+> +	if (data->kind == max6695)
 > +		config &= ~0x08;
 > +
 >  	config &= 0xBF;	/* run */
@@ -480,12 +480,12 @@ with data->update_lock held.
 > +	u8 config, alarms, alarms2 = 0;
 >  
 >  	lm90_read_reg(client, LM90_REG_R_STATUS, &alarms);
-> -	if ((alarms & 0x7f) = 0) {
+> -	if ((alarms & 0x7f) == 0) {
 > +
-> +	if (data->kind = max6695)
+> +	if (data->kind == max6695)
 > +		lm90_read_reg(client, MAX6695_REG_R_STATUS2, &alarms2);
 > +
-> +	if ((alarms & 0x7f) = 0 && (alarms2 & 0xfe) = 0) {
+> +	if ((alarms & 0x7f) == 0 && (alarms2 & 0xfe) == 0) {
 >  		dev_info(&client->dev, "Everything OK\n");
 >  	} else {
 >  		if (alarms & 0x61)
@@ -516,7 +516,7 @@ with data->update_lock held.
 > +		lm90_read_reg(client, LM90_REG_R_STATUS, &alarms);
 > +		data->alarms = alarms;	/* save as 16 bit value */
 > +
-> +		if (data->kind = max6695) {
+> +		if (data->kind == max6695) {
 > +			lm90_select_remote_channel(client, data, 1);
 > +			lm90_read_reg(client, LM90_REG_R_REMOTE_CRIT,
 > +				      &data->temp8[6]);
@@ -542,8 +542,3 @@ Code looks overall pretty clean. Great job!
 
 -- 
 Jean Delvare
-
-_______________________________________________
-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 9905e83..4ca1da9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\01284038750-8833-1-git-send-email-guenter.roeck@ericsson.com\0"
  "ref\01284038750-8833-8-git-send-email-guenter.roeck@ericsson.com\0"
  "From\0Jean Delvare <khali@linux-fr.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH v2 7/7] hwmon: (lm90) Add support for\0"
- "Date\0Wed, 15 Sep 2010 11:20:29 +0000\0"
+ "Subject\0Re: [PATCH v2 7/7] hwmon: (lm90) Add support for max6695 and max6696\0"
+ "Date\0Wed, 15 Sep 2010 13:20:29 +0200\0"
  "To\0Guenter Roeck <guenter.roeck@ericsson.com>\0"
  "Cc\0Andrew Morton <akpm@linux-foundation.org>"
   lm-sensors@lm-sensors.org
@@ -338,7 +338,7 @@
  "> +{\n"
  "> +\tu8 config;\n"
  "> +\n"
- "> +\tif (data->kind = max6695) {\n"
+ "> +\tif (data->kind == max6695) {\n"
  "> +\t\tlm90_read_reg(client, LM90_REG_R_CONFIG1, &config);\n"
  "> +\t\tconfig &= ~0x08;\n"
  "> +\t\tif (channel)\n"
@@ -354,7 +354,7 @@
  "> @@ -786,6 +888,23 @@ static int lm90_detect(struct i2c_client *new_client,\n"
  ">  \t\t}\n"
  ">  \t} else\n"
- ">  \tif (man_id = 0x4D) { /* Maxim */\n"
+ ">  \tif (man_id == 0x4D) { /* Maxim */\n"
  "> +\t\tint reg_emerg, reg_emerg2, reg_status2;\n"
  "> +\n"
  "> +\t\t/*\n"
@@ -389,10 +389,10 @@
  "> +\t\t * limit registers. We can detect those chips by checking if\n"
  "> +\t\t * one of those registers exists.\n"
  "> +\t\t */\n"
- "> +\t\tif (chip_id = 0x01\n"
- "> +\t\t && (reg_config1 & 0x10) = 0x00\n"
- "> +\t\t && (reg_status2 & 0x01) = 0x00\n"
- "> +\t\t && reg_emerg = reg_emerg2\n"
+ "> +\t\tif (chip_id == 0x01\n"
+ "> +\t\t && (reg_config1 & 0x10) == 0x00\n"
+ "> +\t\t && (reg_status2 & 0x01) == 0x00\n"
+ "> +\t\t && reg_emerg == reg_emerg2\n"
  "> +\t\t && reg_convrate <= 0x07) {\n"
  "> +\t\t\tname = \"max6695\";\n"
  "> +\t\t} else\n"
@@ -430,9 +430,9 @@
  "> +\t    && data->kind != max6646 && data->kind != max6695)\n"
  ">  \t\tdata->flags |= LM90_HAVE_OFFSET;\n"
  ">  \n"
- ">  \tif (data->kind = max6657 || data->kind = max6659\n"
- "> -\t    || data->kind = max6646)\n"
- "> +\t    || data->kind = max6646 || data->kind = max6695)\n"
+ ">  \tif (data->kind == max6657 || data->kind == max6659\n"
+ "> -\t    || data->kind == max6646)\n"
+ "> +\t    || data->kind == max6646 || data->kind == max6695)\n"
  ">  \t\tdata->flags |= LM90_HAVE_LOCAL_EXT;\n"
  ">  \n"
  ">  \tif (data->kind != max6657 && data->kind != max6659\n"
@@ -441,11 +441,11 @@
  "> +\t    && data->kind != max6695)\n"
  ">  \t\tdata->flags |= LM90_HAVE_REM_LIMIT_EXT;\n"
  ">  \n"
- "> -\tif (data->kind = max6659)\n"
- "> +\tif (data->kind = max6659 || data->kind = max6695)\n"
+ "> -\tif (data->kind == max6659)\n"
+ "> +\tif (data->kind == max6659 || data->kind == max6695)\n"
  ">  \t\tdata->flags |= LM90_HAVE_EMERGENCY;\n"
  ">  \n"
- "> +\tif (data->kind = max6695)\n"
+ "> +\tif (data->kind == max6695)\n"
  "> +\t\tdata->flags |= LM90_HAVE_EMERGENCY_ALARM | LM90_HAVE_TEMP3;\n"
  "> +\n"
  ">  \t/* Initialize the LM90 chip */\n"
@@ -471,13 +471,13 @@
  ">  \tdata->hwmon_dev = hwmon_device_register(&new_client->dev);\n"
  ">  \tif (IS_ERR(data->hwmon_dev)) {\n"
  "> @@ -985,6 +1146,12 @@ static void lm90_init_client(struct i2c_client *client)\n"
- ">  \tif (data->kind = max6680)\n"
+ ">  \tif (data->kind == max6680)\n"
  ">  \t\tconfig |= 0x18;\n"
  ">  \n"
  "> +\t/*\n"
  "> +\t * Select external channel 1 for max6695\n"
  "> +\t */\n"
- "> +\tif (data->kind = max6695)\n"
+ "> +\tif (data->kind == max6695)\n"
  "> +\t\tconfig &= ~0x08;\n"
  "> +\n"
  ">  \tconfig &= 0xBF;\t/* run */\n"
@@ -491,12 +491,12 @@
  "> +\tu8 config, alarms, alarms2 = 0;\n"
  ">  \n"
  ">  \tlm90_read_reg(client, LM90_REG_R_STATUS, &alarms);\n"
- "> -\tif ((alarms & 0x7f) = 0) {\n"
+ "> -\tif ((alarms & 0x7f) == 0) {\n"
  "> +\n"
- "> +\tif (data->kind = max6695)\n"
+ "> +\tif (data->kind == max6695)\n"
  "> +\t\tlm90_read_reg(client, MAX6695_REG_R_STATUS2, &alarms2);\n"
  "> +\n"
- "> +\tif ((alarms & 0x7f) = 0 && (alarms2 & 0xfe) = 0) {\n"
+ "> +\tif ((alarms & 0x7f) == 0 && (alarms2 & 0xfe) == 0) {\n"
  ">  \t\tdev_info(&client->dev, \"Everything OK\\n\");\n"
  ">  \t} else {\n"
  ">  \t\tif (alarms & 0x61)\n"
@@ -527,7 +527,7 @@
  "> +\t\tlm90_read_reg(client, LM90_REG_R_STATUS, &alarms);\n"
  "> +\t\tdata->alarms = alarms;\t/* save as 16 bit value */\n"
  "> +\n"
- "> +\t\tif (data->kind = max6695) {\n"
+ "> +\t\tif (data->kind == max6695) {\n"
  "> +\t\t\tlm90_select_remote_channel(client, data, 1);\n"
  "> +\t\t\tlm90_read_reg(client, LM90_REG_R_REMOTE_CRIT,\n"
  "> +\t\t\t\t      &data->temp8[6]);\n"
@@ -552,11 +552,6 @@
  "Code looks overall pretty clean. Great job!\n"
  "\n"
  "-- \n"
- "Jean Delvare\n"
- "\n"
- "_______________________________________________\n"
- "lm-sensors mailing list\n"
- "lm-sensors@lm-sensors.org\n"
- http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
+ Jean Delvare
 
-3f2c72234bab50544f3bc76ff5c8bc7667db639a6676d02742fe18f529e83355
+18382619feefdede441c46fc8e276a0668c44000cf4be28d6d77da6d781b8922
