diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-08 11:05:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-08 11:05:37 -0200 |
| commit | 6c16e60ebc542dfe803c0070aaf3e356185b521a (patch) | |
| tree | 2aa7c6c70920c0f4a67a58a202f34f403df3a671 /linux/drivers/media/video/cx88/cx88.h | |
| parent | 243c1d1fa0d09431bf84f02e4a20c002da7c08c7 (diff) | |
| parent | 56a304929cac33ceb38bbb90f4bb30c9477f64d5 (diff) | |
| download | mediapointer-dvb-s2-6c16e60ebc542dfe803c0070aaf3e356185b521a.tar.gz mediapointer-dvb-s2-6c16e60ebc542dfe803c0070aaf3e356185b521a.tar.bz2 | |
Merged patch 3310 at tip
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 982cbe6c7..7a7219377 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.98 2006/01/08 03:39:03 pascoe Exp $ + * $Id: cx88.h,v 1.99 2006/01/29 20:28:54 mkrufky Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -39,6 +39,9 @@ #include "cx88-reg.h" #include <linux/version.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #define CX88_VERSION_CODE KERNEL_VERSION(0,0,5) #ifndef TRUE @@ -194,6 +197,7 @@ extern struct sram_channel cx88_sram_channels[]; #define CX88_BOARD_DNTV_LIVE_DVB_T_PRO 42 #define CX88_BOARD_KWORLD_DVB_T_CX22702 43 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL 44 +#define CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT 45 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, @@ -318,8 +322,11 @@ struct cx88_core { /* IR remote control state */ struct cx88_IR *ir; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex lock; +#else struct semaphore lock; - +#endif /* various v4l controls */ u32 freq; |