[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-44-g432c0e2

[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  432c0e22ff87d4220b9505d6e63caea163d2ccad (commit)
       via  bea11b0008f57296683b2395cbe2bd405b74bdb2 (commit)
      from  c370a7ae9bf6763560df39995b445b0bf2777176 (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 432c0e22ff87d4220b9505d6e63caea163d2ccad
Merge: bea11b0008f57296683b2395cbe2bd405b74bdb2 c370a7ae9bf6763560df39995b445b0bf2777176
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Apr 11 10:49:50 2011 +0200

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

commit bea11b0008f57296683b2395cbe2bd405b74bdb2
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Apr 11 10:48:47 2011 +0200

    [LINUX] Makes Armadeus custom drivers compile again on new BR

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

Summary of changes:
 target/linux/modules/Makefile         |    2 +-
 target/linux/modules/display/Makefile |    2 +-
 target/linux/modules/fpga/Makefile    |    4 ----
 target/linux/modules/gpio/Makefile    |    2 +-
 target/linux/modules/isp1761/Makefile |    4 ----
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/target/linux/modules/Makefile b/target/linux/modules/Makefile
index 6e14e40..e075544 100755
--- a/target/linux/modules/Makefile
+++ b/target/linux/modules/Makefile
@@ -25,7 +25,7 @@ KDIR	:= $(LINUX_DIR)
 PWD	:= $(shell pwd)
 
 default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux- modules
 
 DIRS	:= $(shell ls)
 clean:
diff --git a/target/linux/modules/display/Makefile b/target/linux/modules/display/Makefile
index 7783230..06d7ba2 100644
--- a/target/linux/modules/display/Makefile
+++ b/target/linux/modules/display/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for the i.MXL backlight driver
+# Makefile for the hx5116_display driver
 #
 
 # Part executed when called from kernel build system:
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index 463ba70..905acf8 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -26,9 +26,5 @@ PWD	:= $(shell pwd)
 # Armadeus custom drivers common targets (default, clean, etc...)
 include ../Makefile.in
 
-install:
-	echo "Installing Armadeus drivers..."
-	 $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-    
 endif
 
diff --git a/target/linux/modules/gpio/Makefile b/target/linux/modules/gpio/Makefile
index 1b06f42..d536614 100755
--- a/target/linux/modules/gpio/Makefile
+++ b/target/linux/modules/gpio/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_ARMADEUS_GPIO_DRIVER)	+= gpio.o
 obj-$(CONFIG_ARMADEUS_PPDEV_DRIVER)	+= ppdev.o
 
 gpio-objs	:= core.o
-ppdev-objs  := ppdevemu.o
+ppdev-objs	:= ppdevemu.o
 
 # Part executed when called from standard make in this directory:
 # (preferably use Makefile in parent directory)
diff --git a/target/linux/modules/isp1761/Makefile b/target/linux/modules/isp1761/Makefile
index fb7db04..63f4599 100644
--- a/target/linux/modules/isp1761/Makefile
+++ b/target/linux/modules/isp1761/Makefile
@@ -22,8 +22,4 @@ PWD	:= $(shell pwd)
 # Armadeus custom drivers common targets (default, clean, etc...)
 include ../Makefile.in
 
-install:
-	echo "Installing Armadeus drivers..."
-	 $(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
-    
 endif


hooks/post-receive
-- 
armadeus