[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-500-g5f04742

[Fabien M <fa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  5f04742b90177c806ef2f8b82b919df7e9af6c0d (commit)
       via  19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa (commit)
      from  69723ee95bbd2bfbd559a8fc179746ec4e0eb031 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5f04742b90177c806ef2f8b82b919df7e9af6c0d
Merge: 19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa 69723ee95bbd2bfbd559a8fc179746ec4e0eb031
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jun 24 10:58:44 2010 +0200

    Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Jun 24 10:58:19 2010 +0200

    Cosmetic again

-----------------------------------------------------------------------

Summary of changes:
 ...ing_mangling_capability_on_i2c_mxc_driver.patch |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index a01bf99..ed1cd95 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -1,3 +1,7 @@
+Adding mangling capability on mxc I²C driver.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
 Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
 ===================================================================
 --- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c	2010-06-23 17:56:23.000000000 +0200
@@ -17,7 +21,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
 -	int retry = 4;
 +	int retry;
 +
-+	if (trans_flag& I2C_M_IGNORE_NAK) {
++	if (trans_flag & I2C_M_IGNORE_NAK) {
 +		retry = 1;
 +	} else {
 +		retry = 4;
@@ -31,11 +35,11 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
  #endif
 -		return -1;
 -	}
-+	    if (trans_flag& I2C_M_IGNORE_NAK)
-+		    return 0;
-+    	else
-+	    	return -1;
-+    	}
++	if (trans_flag & I2C_M_IGNORE_NAK)
++		return 0;
++	else
++		return -1;
++ 	}
  
  	return 0;
  }


hooks/post-receive
-- 
armadeus