[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2452-g2b15910

[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  2b159105d548b8fd0be1229920c322501cf3e474 (commit)
       via  91a5a58223fdac8f8e7ec480877d9833d91d697e (commit)
      from  52b05d53aad1f2a1d3770fd98fc8a858f99a7a44 (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 2b159105d548b8fd0be1229920c322501cf3e474
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Aug 5 17:10:37 2011 +0200

    [linux][fpga] Little bug in probe error management for irq_manager

commit 91a5a58223fdac8f8e7ec480877d9833d91d697e
Author: Fabien Marteau <fab...@ar...>
Date:   Fri Aug 5 16:27:59 2011 +0200

    [linux][fpga] Include armadeus Makefile.in ignoring errors

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

Summary of changes:
 .../fpga/virtual_components/button/Makefile        |    2 +-
 .../fpga/virtual_components/irq_mngr/main.c        |    2 ++
 .../modules/fpga/virtual_components/led/Makefile   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index d4bde09..2df8d7f 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON)	+= button_ocore.o
 button_ocore-objs := gbutton.o
 
 ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 KDIR := $(ARMADEUS_LINUX_DIR)
 PWD  := $(shell pwd)
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index 9b2f430..dcaf256 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -276,7 +276,9 @@ request_irq_error:
 out_iounmap:
 	iounmap(mng->membase);
 out_dev_free:
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,36)
 	kfree(mng);
+#endif
 out_release_mem:
 	release_mem_region(mem_res->start, resource_size(mem_res));
 
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index 06eb19b..e8ac2e1 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
 led_ocore-objs := g_led.o
 
 ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 KDIR := $(ARMADEUS_LINUX_DIR)
 PWD  := $(shell pwd)


hooks/post-receive
-- 
armadeus