diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 13:59:37 -0200 |
| commit | be80b76533c8db5af8ef3464c84d56c45767ed60 (patch) | |
| tree | 4ccb7c9d66f221a8c881332319523c91f10f683d /linux/drivers/media/video/saa7134/saa7134.h | |
| parent | e2273bb85e79b09bafd264fda1832f9fbb4f4ff5 (diff) | |
| download | mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.gz mediapointer-dvb-s2-be80b76533c8db5af8ef3464c84d56c45767ed60.tar.bz2 | |
sem2mutex: drivers/media/, #2
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Kernel-sync from patch 3318b
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index 9add281a3..522ae567f 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -30,6 +30,9 @@ #include <linux/input.h> #include <linux/notifier.h> #include <linux/delay.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #include <asm/io.h> @@ -372,7 +375,11 @@ struct saa7134_fh { /* dmasound dsp status */ struct saa7134_dmasound { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex lock; +#else struct semaphore lock; +#endif int minor_mixer; int minor_dsp; unsigned int users_dsp; @@ -438,7 +445,11 @@ struct saa7134_mpeg_ops { /* global device status */ struct saa7134_dev { struct list_head devlist; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex lock; +#else struct semaphore lock; +#endif spinlock_t slock; #ifdef VIDIOC_G_PRIORITY struct v4l2_prio_state prio; |