diff for duplicates of <1289882005.2147.1489.camel@pasglop>

diff --git a/a/1.txt b/N1/1.txt
index 5f06113..c1e7b16 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -403,7 +403,7 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > -
 > -	while (count--) {
 > -		result = ams_i2c_read(AMS_COMMAND);
-> -		if (result = 0 || result & 0x80)
+> -		if (result == 0 || result & 0x80)
 > -			return 0;
 > -
 > -		schedule_timeout_uninterruptible(HZ / 20);
@@ -957,7 +957,8 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > -	AMS_IRQ_FREEFALL = 0x01,
 > -	AMS_IRQ_SHOCK = 0x02,
 > -	AMS_IRQ_GLOBAL = 0x04,
-> -	AMS_IRQ_ALL > -		AMS_IRQ_FREEFALL |
+> -	AMS_IRQ_ALL =
+> -		AMS_IRQ_FREEFALL |
 > -		AMS_IRQ_SHOCK |
 > -		AMS_IRQ_GLOBAL,
 > -};
@@ -1383,7 +1384,7 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > +
 > +	while (count--) {
 > +		result = ams_i2c_read(AMS_COMMAND);
-> +		if (result = 0 || result & 0x80)
+> +		if (result == 0 || result & 0x80)
 > +			return 0;
 > +
 > +		schedule_timeout_uninterruptible(HZ / 20);
@@ -1937,7 +1938,8 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > +	AMS_IRQ_FREEFALL = 0x01,
 > +	AMS_IRQ_SHOCK = 0x02,
 > +	AMS_IRQ_GLOBAL = 0x04,
-> +	AMS_IRQ_ALL > +		AMS_IRQ_FREEFALL |
+> +	AMS_IRQ_ALL =
+> +		AMS_IRQ_FREEFALL |
 > +		AMS_IRQ_SHOCK |
 > +		AMS_IRQ_GLOBAL,
 > +};
@@ -2092,11 +2094,4 @@ Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 > +
 > +obj-$(CONFIG_SENSORS_AMS)	+= ams/
 > 
-> 
-
-
-
-_______________________________________________
-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 dde45eb..5576907 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020101005121043.08771994@endymion.delvare\0"
  "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0"
- "Subject\0Re: [lm-sensors] [PATCH] Move ams driver to macintosh\0"
- "Date\0Tue, 16 Nov 2010 04:33:25 +0000\0"
+ "Subject\0Re: [PATCH] Move ams driver to macintosh\0"
+ "Date\0Tue, 16 Nov 2010 15:33:25 +1100\0"
  "To\0Jean Delvare <khali@linux-fr.org>\0"
  "Cc\0Michael Hanselmann <linux-kernel@hansmi.ch>"
   LM Sensors <lm-sensors@lm-sensors.org>
@@ -415,7 +415,7 @@
  "> -\n"
  "> -\twhile (count--) {\n"
  "> -\t\tresult = ams_i2c_read(AMS_COMMAND);\n"
- "> -\t\tif (result = 0 || result & 0x80)\n"
+ "> -\t\tif (result == 0 || result & 0x80)\n"
  "> -\t\t\treturn 0;\n"
  "> -\n"
  "> -\t\tschedule_timeout_uninterruptible(HZ / 20);\n"
@@ -969,7 +969,8 @@
  "> -\tAMS_IRQ_FREEFALL = 0x01,\n"
  "> -\tAMS_IRQ_SHOCK = 0x02,\n"
  "> -\tAMS_IRQ_GLOBAL = 0x04,\n"
- "> -\tAMS_IRQ_ALL > -\t\tAMS_IRQ_FREEFALL |\n"
+ "> -\tAMS_IRQ_ALL =\n"
+ "> -\t\tAMS_IRQ_FREEFALL |\n"
  "> -\t\tAMS_IRQ_SHOCK |\n"
  "> -\t\tAMS_IRQ_GLOBAL,\n"
  "> -};\n"
@@ -1395,7 +1396,7 @@
  "> +\n"
  "> +\twhile (count--) {\n"
  "> +\t\tresult = ams_i2c_read(AMS_COMMAND);\n"
- "> +\t\tif (result = 0 || result & 0x80)\n"
+ "> +\t\tif (result == 0 || result & 0x80)\n"
  "> +\t\t\treturn 0;\n"
  "> +\n"
  "> +\t\tschedule_timeout_uninterruptible(HZ / 20);\n"
@@ -1949,7 +1950,8 @@
  "> +\tAMS_IRQ_FREEFALL = 0x01,\n"
  "> +\tAMS_IRQ_SHOCK = 0x02,\n"
  "> +\tAMS_IRQ_GLOBAL = 0x04,\n"
- "> +\tAMS_IRQ_ALL > +\t\tAMS_IRQ_FREEFALL |\n"
+ "> +\tAMS_IRQ_ALL =\n"
+ "> +\t\tAMS_IRQ_FREEFALL |\n"
  "> +\t\tAMS_IRQ_SHOCK |\n"
  "> +\t\tAMS_IRQ_GLOBAL,\n"
  "> +};\n"
@@ -2104,13 +2106,6 @@
  "> +\n"
  "> +obj-$(CONFIG_SENSORS_AMS)\t+= ams/\n"
  "> \n"
- "> \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
+ >
 
-529d9f5350eb5bf72c75c190d29ca8489ac5149dde4b07d8cf7df16e4a40ba98
+332558e56da40b8a9cb45a352402b3bd2aef2e31656d6bb421aee961877a89bc
