Module: xenomai-gch
Branch: for-2.4
Commit: c3f562b596300d86f44e82fa41d582f2005a8211
URL:    
http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=c3f562b596300d86f44e82fa41d582f2005a8211

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Sun Dec 27 19:03:02 2009 +0100

blackfin: avoid redefinition of CAN_ERR_MASK with Linux 2.6.30

---

 include/asm-blackfin/wrappers.h |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/asm-blackfin/wrappers.h b/include/asm-blackfin/wrappers.h
index 1f1a294..aebeff2 100644
--- a/include/asm-blackfin/wrappers.h
+++ b/include/asm-blackfin/wrappers.h
@@ -27,6 +27,10 @@
 #include <asm-generic/xenomai/wrappers.h> /* Read the generic portion. */
 #include <linux/interrupt.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
+#undef CAN_ERR_MASK
+#endif
+
 #define wrap_phys_mem_prot(filp,pfn,size,prot) (prot)
 
 #define wrap_access_ok(task,addr,size) _access_ok((unsigned long)(addr),(size))


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to