diff for duplicates of <20101005121043.08771994@endymion.delvare>

diff --git a/a/1.txt b/N1/1.txt
index c4f2d98..0f176c7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -397,7 +397,7 @@ Cc: Grant Likely <grant.likely@secretlab.ca>
 -
 -	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);
@@ -951,7 +951,8 @@ Cc: Grant Likely <grant.likely@secretlab.ca>
 -	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,
 -};
@@ -1377,7 +1378,7 @@ Cc: Grant Likely <grant.likely@secretlab.ca>
 +
 +	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);
@@ -1931,7 +1932,8 @@ Cc: Grant Likely <grant.likely@secretlab.ca>
 +	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,
 +};
@@ -2089,8 +2091,3 @@ Cc: Grant Likely <grant.likely@secretlab.ca>
 
 -- 
 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 bee56ce..10d23db 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Jean Delvare <khali@linux-fr.org>\0"
- "Subject\0[lm-sensors] [PATCH] Move ams driver to macintosh\0"
- "Date\0Tue, 05 Oct 2010 10:10:43 +0000\0"
+ "Subject\0[PATCH] Move ams driver to macintosh\0"
+ "Date\0Tue, 5 Oct 2010 12:10:43 +0200\0"
  "To\0LM Sensors <lm-sensors@lm-sensors.org>"
  " linuxppc-dev@lists.ozlabs.org\0"
  "Cc\0Stelian Pop <stelian@popies.net>"
@@ -407,7 +407,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"
@@ -961,7 +961,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"
@@ -1387,7 +1388,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"
@@ -1941,7 +1942,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"
@@ -2098,11 +2100,6 @@
  "\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
 
-0a327faf9412053051f9f5ab0c9528f11c4d529d151ddcd5d5f2df3bbaaff110
+212d4b7835c4d027188ac286e9b1679e969824f59cd3acdfedb8aac21bbed445
