[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-189-ga58152c

[Julien B a. A. <ar...@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  a58152c247e41d10d376bb0928e7d2b3f9279367 (commit)
       via  4c743abb34988520ac1a13420335486a39d75204 (commit)
      from  950a0f49509c5b52269ea89754b481f450d065d4 (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 a58152c247e41d10d376bb0928e7d2b3f9279367
Merge: 4c743ab 950a0f4
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Mar 21 15:24:18 2012 +0100

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

commit 4c743abb34988520ac1a13420335486a39d75204
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Mar 21 15:21:23 2012 +0100

    [TOOLS] imxregs: imx51regs.h -> imx5regs.h

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

Summary of changes:
 buildroot/package/armadeus/imxregs/imxregs.mk      |    2 +-
 target/linux/debug/imxregs/Makefile                |    2 +-
 .../debug/imxregs/{imx51regs.h => imx5regs.h}      |    0
 target/linux/debug/imxregs/imxregs.c               |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename target/linux/debug/imxregs/{imx51regs.h => imx5regs.h} (100%)

diff --git a/buildroot/package/armadeus/imxregs/imxregs.mk b/buildroot/package/armadeus/imxregs/imxregs.mk
index 2ce11f2..2711674 100644
--- a/buildroot/package/armadeus/imxregs/imxregs.mk
+++ b/buildroot/package/armadeus/imxregs/imxregs.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IMXREGS_VERSION = 1.1
+IMXREGS_VERSION = 1.2
 IMXREGS_SITE = $(TOPDIR)/../target/linux/debug/imxregs/
 IMXREGS_SITE_METHOD = copy
 
diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index 2d1fc5f..5ef8944 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -12,7 +12,7 @@ imx27regs: imxregs.c imx27regs.h definitions.h
 imx28regs: imxregs.c imx28regs.h definitions.h
 	$(CC) -DIMX28 imxregs.c -o $@
 
-imx51regs: imxregs.c imx51regs.h definitions.h
+imx51regs: imxregs.c imx5regs.h definitions.h
 	$(CC) -DIMX51 imxregs.c -o $@
 
 clean:
diff --git a/target/linux/debug/imxregs/imx51regs.h b/target/linux/debug/imxregs/imx5regs.h
similarity index 100%
rename from target/linux/debug/imxregs/imx51regs.h
rename to target/linux/debug/imxregs/imx5regs.h
diff --git a/target/linux/debug/imxregs/imxregs.c b/target/linux/debug/imxregs/imxregs.c
index 812bbbf..90ad295 100644
--- a/target/linux/debug/imxregs/imxregs.c
+++ b/target/linux/debug/imxregs/imxregs.c
@@ -36,7 +36,7 @@
 #elif defined(IMX28)
 #include "imx28regs.h"
 #elif defined(IMX51)
-#include "imx51regs.h"
+#include "imx5regs.h"
 #else
 #include "imxregs.h"
 #endif


hooks/post-receive
-- 
armadeus