diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 15 | ||||
| -rw-r--r-- | v4l/compat.h | 4 |
2 files changed, 17 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index bb724fbde..997383782 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-11-12 22:57 hverkuil + + * ../linux/drivers/media/video/compat_ioctl32.c: + - Fixed 64-bit bug: a wrongly placed return + in compat_ioctl32.c broke 32-bit compatibility ioctl support. + + * ../linux/drivers/media/video/em28xx/em28xx-core.c: + - Fix a 64-bit compile warning due to a wrong printk format. + + * ../v4l/compat.h: + - Fixed 2.6.13 support: kzalloc appeared in 2.6.14, not + 2.6.13. Also added missing smp_lock.h #include. + + Signed-off-by: hverkuil <hverkuil@xs4all.nl> + 2005-11-12 00:06 mchehab * ../linux/drivers/media/video/Makefile: diff --git a/v4l/compat.h b/v4l/compat.h index 94ff08586..df1fadb5d 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.31 2005/11/09 21:54:53 nsh Exp $ + * $Id: compat.h,v 1.32 2005/11/12 23:12:53 hverkuil Exp $ */ #ifndef _COMPAT_H @@ -239,7 +239,7 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) #ifndef kzalloc #define kzalloc(size, flags) \ ({ \ |