diff options
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h index f75dd1613..657f86159 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h @@ -35,11 +35,7 @@ #include <linux/videodev2.h> #include <linux/i2c.h> #include <linux/workqueue.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) #include <linux/mutex.h> -#else -#include <asm/semaphore.h> -#endif #include "pvrusb2-hdw.h" #include "pvrusb2-io.h" #include <media/cx2341x.h> @@ -195,11 +191,7 @@ struct pvr2_hdw { struct pvr2_stream *vid_stream; /* Mutex for all hardware state control */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) struct mutex big_lock_mutex; -#else - struct semaphore big_lock_mutex; -#endif int big_lock_held; /* For debugging */ char name[32]; @@ -215,22 +207,14 @@ struct pvr2_hdw { unsigned long i2c_stale_mask; /* Pending broadcast change bits */ unsigned long i2c_active_mask; /* All change bits currently in use */ struct list_head i2c_clients; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) struct mutex i2c_list_lock; -#else - struct semaphore i2c_list_lock; -#endif /* Frequency table */ unsigned int freqTable[FREQTABLE_SIZE]; unsigned int freqProgSlot; /* Stuff for handling low level control interaction with device */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) struct mutex ctl_lock_mutex; -#else - struct semaphore ctl_lock_mutex; -#endif int ctl_lock_held; /* For debugging */ struct urb *ctl_write_urb; struct urb *ctl_read_urb; |