diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch index a8f3607ed..286b53ca4 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/files/0001-redpine-allow-to-build-with-gcc-4.7.patch @@ -1,5 +1,6 @@ -From: Javier Viguera -Date: Thu, 3 Jan 2013 14:38:07 +0100 +From 8bfb3f0123ef6519d70baaf9c8ac2ef3cf1b86ff Mon Sep 17 00:00:00 2001 +From: Alex Gonzalez +Date: Mon, 21 Jan 2013 17:07:18 +0100 Subject: [PATCH] redpine: allow to build with gcc-4.7 Otherwise it fails with: @@ -8,26 +9,23 @@ error: inlining failed in call to always_inline 'ganges_bufferfull_acquire_lock' error: inlining failed in call to always_inline 'ganges_bufferfull_release_lock': function body not available Signed-off-by: Javier Viguera - -Conflicts: - RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h +Signed-off-by: Alex Gonzalez --- - RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h | 4 ++-- + RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h b/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h -index c75c22b..92420db 100644 +index 2eb31f5..aa789a7 100644 --- a/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h +++ b/RS.GENR.LNX.SD_NON_GPL/include/Linux/ganges_mgmt.h -@@ -1075,11 +1075,11 @@ INT32 ganges_start_per_tx(PGANGES_CLIENT Adapter,UINT8 *ptr); +@@ -1093,10 +1093,10 @@ INT32 ganges_start_per_tx(PGANGES_CLIENT Adapter,UINT8 *ptr); GANGES_STATUS ganges_do_continuous_send(PGANGES_CLIENT Adapter, UINT16 mode); VOID ganges_fsm_compute_snr(PGANGES_CLIENT Adapter,PScanConfirm scanConfirm,UINT8 mode); -inline VOID ganges_bufferfull_acquire_lock( +VOID ganges_bufferfull_acquire_lock( - VOID (*fptr)(PVOID sem,DWORD delay_msec), + DWORD (*fptr)(PVOID sem,INT delay_msec), PGANGES_CLIENT Adapter); - -inline BOOLEAN +BOOLEAN ganges_bufferfull_release_lock diff --git a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb index e1986810a..92b12aa07 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-redpine/kernel-module-redpine_git.bb @@ -7,7 +7,7 @@ inherit module PR = "r0" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRCREV = "del-5.9.2.1" +SRCREV = "del-5.7.2" SRC_URI = "${DIGI_LOG_GIT}linux-modules/redpine.git;protocol=git \ file://0001-redpine-allow-to-build-with-gcc-4.7.patch \ file://redpine"