diff options
Diffstat (limited to 'v4l/compat.h')
| -rw-r--r-- | v4l/compat.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index d13fe010c..94ff08586 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.30 2005/11/08 17:46:27 nsh Exp $ + * $Id: compat.h,v 1.31 2005/11/09 21:54:53 nsh Exp $ */ #ifndef _COMPAT_H @@ -201,6 +201,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) return page_to_pfn(vmalloc_to_page(vmalloc_addr)); } +#ifndef wait_event_timeout #define wait_event_timeout(wq, condition, timeout) \ ({ \ long __ret = timeout; \ @@ -219,12 +220,14 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) } while (0); \ __ret; \ }) +#endif #define remap_pfn_range remap_page_range #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) +#ifndef kcalloc #define kcalloc(n,size,flags) \ ({ \ void * __ret = NULL; \ @@ -234,8 +237,10 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) __ret; \ }) #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#ifndef kzalloc #define kzalloc(size, flags) \ ({ \ void *__ret = kmalloc(size, flags); \ @@ -244,6 +249,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) __ret; \ }) #endif +#endif #endif /* |