[Xenomai-git] Gilles Chanteperdrix : blackfin: avoid redefinition of CAN_ERR_MASK with Linux 2.6.30
Module: xenomai-gch Branch: for-head Commit: 6d4b8e8cd1d8f33a73b3829e0ab55205640023de URL: http://git.xenomai.org/?p=xenomai-gch.git;a=commit;h=6d4b8e8cd1d8f33a73b3829e0ab55205640023de 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 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/asm-blackfin/wrappers.h b/include/asm-blackfin/wrappers.h index 6556e74..4573f52 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_strncpy_from_user(dstP, srcP, n) strncpy_from_user(dstP, srcP, n) ___ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
[Xenomai-git] Gilles Chanteperdrix : blackfin: avoid redefinition of CAN_ERR_MASK with Linux 2.6.30
Module: xenomai-head Branch: master Commit: 6d4b8e8cd1d8f33a73b3829e0ab55205640023de URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=6d4b8e8cd1d8f33a73b3829e0ab55205640023de 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 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/asm-blackfin/wrappers.h b/include/asm-blackfin/wrappers.h index 6556e74..4573f52 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_strncpy_from_user(dstP, srcP, n) strncpy_from_user(dstP, srcP, n) ___ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
