[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-170-gff5bb7f

[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  ff5bb7ff3b94909a3c7a89884618042420f9cff2 (commit)
       via  c3f87acb96c12152b1d25a6b5bf3283b20149934 (commit)
       via  19e27e03f2af402c2bc6422d5a16da163d8e21ec (commit)
      from  cfd43e2f11202dc4ff4605a55467468f93e2fb06 (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 ff5bb7ff3b94909a3c7a89884618042420f9cff2
Merge: c3f87acb96c12152b1d25a6b5bf3283b20149934 cfd43e2f11202dc4ff4605a55467468f93e2fb06
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 16 17:15:20 2010 +0100

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

commit c3f87acb96c12152b1d25a6b5bf3283b20149934
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Dec 12 20:20:36 2010 +0100

    [DEBUG] Correct imxregs compilation

commit 19e27e03f2af402c2bc6422d5a16da163d8e21ec
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Dec 12 20:08:25 2010 +0100

    Indentation

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

Summary of changes:
 target/linux/debug/imxregs/Makefile                |    4 ++--
 target/linux/modules/as1531_platform/Kconfig       |   14 +++++++-------
 target/linux/modules/as1531_platform/as1531_plat.c |   11 +++++------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index ede99ad..bba1f0f 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -1,10 +1,10 @@
 CC=arm-linux-gcc
-EXECS:= imxregs imx27regs imx51regs
+EXECS:= imxlregs imx27regs imx51regs
 
 
 all: $(EXECS)
 
-imxregs: imxregs.c imxregs.h definitions.h
+imxlregs: imxregs.c imxregs.h definitions.h
 	$(CC) imxregs.c -o $@
 
 imx27regs: imxregs.c imx27regs.h definitions.h
diff --git a/target/linux/modules/as1531_platform/Kconfig b/target/linux/modules/as1531_platform/Kconfig
index 2b06294..179722a 100644
--- a/target/linux/modules/as1531_platform/Kconfig
+++ b/target/linux/modules/as1531_platform/Kconfig
@@ -2,10 +2,10 @@
 #
 
 config ARMADEUS_AS1531_PLAT
-        tristate "AS1531 platform data"
-        default n
-        depends on ARMADEUS_DRIVERS
-        select SENSORS_AS1531 
-        ---help---
-				Specific platform data for as1531 plugged on apf27-Dev board
-				on SPI3.
+	tristate "AS1531 platform data"
+	default n
+	depends on ARMADEUS_DRIVERS
+	select SENSORS_AS1531
+	---help---
+	  Specific platform data for as1531 plugged on apf27-Dev board
+	  on SPI3.
diff --git a/target/linux/modules/as1531_platform/as1531_plat.c b/target/linux/modules/as1531_platform/as1531_plat.c
index 7300f57..4f1ea8c 100644
--- a/target/linux/modules/as1531_platform/as1531_plat.c
+++ b/target/linux/modules/as1531_platform/as1531_plat.c
@@ -86,10 +86,9 @@ static struct spi_board_info spi_as1531_board[] = {
 };
 
 
-static int __init init_as1531_plat(void)
+static int __init as1531_plat_init(void)
 {
-	if (as1531_init_gpio() < 0)
-	{
+	if (as1531_init_gpio() < 0) {
 		printk(KERN_ERR "Can't initialize gpio CS for as1531 spi\n");
 		return -1;
 	}
@@ -107,14 +106,14 @@ register_error:
 	return -1;
 }
 
-static void __exit exit_as1531_plat(void)
+static void __exit as1531_plat_exit(void)
 {
 	spi_unregister_device(as1531_spi_dev);
 	as1531_exit_gpio();
 }
 
-module_init(init_as1531_plat);
-module_exit(exit_as1531_plat);
+module_init(as1531_plat_init);
+module_exit(as1531_plat_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");


hooks/post-receive
-- 
armadeus