diff options
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttvp.h')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttvp.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h index c3d1703ac..63d1d4451 100644 --- a/linux/drivers/media/video/bt8xx/bttvp.h +++ b/linux/drivers/media/video/bt8xx/bttvp.h @@ -35,9 +35,7 @@ #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 <linux/scatterlist.h> #include <asm/io.h> #include "compat.h" @@ -366,11 +364,7 @@ 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; #ifdef VIDIOC_G_PRIORITY struct v4l2_prio_state prio; |