diff options
Diffstat (limited to 'linux/drivers/media/video/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bttvp.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttvp.h b/linux/drivers/media/video/bttvp.h index 88f77caa4..5d92d713e 100644 --- a/linux/drivers/media/video/bttvp.h +++ b/linux/drivers/media/video/bttvp.h @@ -1,5 +1,5 @@ /* - $Id: bttvp.h,v 1.31 2005/12/25 19:06:18 mkrufky Exp $ + $Id: bttvp.h,v 1.32 2006/01/15 09:35:15 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -37,6 +37,9 @@ #include <linux/videodev.h> #include <linux/pci.h> #include <linux/input.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #include <asm/scatterlist.h> #include <asm/io.h> @@ -322,9 +325,17 @@ struct bttv { /* locking */ spinlock_t s_lock; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) struct semaphore lock; +#else + struct mutex lock; +#endif int resources; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) struct semaphore reslock; +#else + struct mutex reslock; +#endif #ifdef VIDIOC_G_PRIORITY struct v4l2_prio_state prio; #endif |