diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 11 | ||||
| -rw-r--r-- | v4l/compat.h | 8 |
2 files changed, 18 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 6c5ebbf91..b5851e16e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2005-11-09 21:51 nshmyrev + + * ../linux/drivers/media/video/saa7134/saa7134-oss.c: + (saa7134_dsp_create): + * ../v4l/compat.h: + + - Fix backward kernel compatibity. + + Thanks-to: Tyler Trafford <tatrafford@comcast.net> + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-11-09 19:15 trafford * ../linux/driver/media/video/cx25840/cx25840-firmware.c: 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 /* |