[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-311-gd799fb3

[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  d799fb3ddc79aaa66895fb05bf6308f16165a8f0 (commit)
       via  ebf204b5ba00aab39d8a7a4068d9028bc00feaf8 (commit)
       via  630abe75f70b0ac5d4a1063b842500d0c0ffc7e3 (commit)
      from  b7f5889a3c6740ac887a61e230db1f4c0f491bc5 (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 d799fb3ddc79aaa66895fb05bf6308f16165a8f0
Merge: ebf204b5ba00aab39d8a7a4068d9028bc00feaf8 b7f5889a3c6740ac887a61e230db1f4c0f491bc5
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Apr 21 19:25:43 2010 +0200

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

commit ebf204b5ba00aab39d8a7a4068d9028bc00feaf8
Author: Fabien Marteau <fab...@ar...>
Date:   Wed Apr 21 19:24:54 2010 +0200

    [linux] GPIO mask correction

commit 630abe75f70b0ac5d4a1063b842500d0c0ffc7e3
Author: Fabien Marteau <fab...@ar...>
Date:   Thu Apr 15 14:07:16 2010 +0200

    [linux] change gpio drivers version number

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

Summary of changes:
 target/linux/modules/gpio/core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index d63204f..7f93037 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -46,7 +46,7 @@
 
 
 #define DRIVER_NAME    "Armadeus GPIOs driver"
-#define DRIVER_VERSION "2.3"
+#define DRIVER_VERSION "2.4"
 /* By default, we use dynamic allocation of major numbers -> MAJOR = 0 */
 #define GPIO_MAJOR 0
 #define GPIO_PROC_DIRNAME         "driver/gpio"
@@ -253,7 +253,7 @@ static unsigned char getIrqFromPin(int num_pin, int num_port)
 #ifdef CONFIG_ARCH_IMX
 static unsigned long PORT_MASK[]= { 0x0003FFFE, 0xF00FFF00, 0x0003E1F8, 0xFFFFFFFF };
 #else
-static unsigned long PORT_MASK[]= { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFF6060, 0xFFFE0000, 0x00FFFCFF8, 0x006B6C80 };
+static unsigned long PORT_MASK[]= { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFC000, 0xFFFE0000, 0x00FFCCF8, 0x00FFFF80 };
 #endif
 
 static void initialize_port(int port, int* init_params)


hooks/post-receive
-- 
armadeus