diff options
Diffstat (limited to 'v4l')
-rw-r--r-- | v4l/ChangeLog | 11 | ||||
-rw-r--r-- | v4l/compat.h | 10 |
2 files changed, 20 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 317babd3d..d8184bf2e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,14 @@ +2006-01-15 09:12 mchehab + + * linux/drivers/media/video/bttv-driver.c: (check_alloc_btres), + (free_btres), (bttv_common_ioctls), (radio_open): + * linux/drivers/media/video/bttvp.h: + * v4l/compat.h: + - Semaphore to mutex conversion. + + Signed-off-by: Ingo Molnar <mingo@elte.hu> + Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> + 2006-01-15 08:57 mchehab * linux/drivers/media/video/cx88/cx88-tvaudio.c: diff --git a/v4l/compat.h b/v4l/compat.h index a35acc464..774afc8da 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.43 2005/12/11 18:11:56 mchehab Exp $ + * $Id: compat.h,v 1.44 2006/01/15 09:35:16 mchehab Exp $ */ #ifndef _COMPAT_H @@ -270,6 +270,14 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) # define input_free_device(input_dev) kfree(input_dev) #endif +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) +#define DEFINE_MUTEX(a) DECLARE_MUTEX(a) +#define mutex_lock_interruptible(a) down_interruptible(a) +#define mutex_unlock(a) up(a) +#define mutex_lock(a) down(a) +#define mutex_init(a) init_MUTEX(a) +#endif + #endif /* * Local variables: |