linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / ttpci / av7110.h

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 9c79696..fafd25f 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -6,13 +6,16 @@
 #include <linux/netdevice.h>
 #include <linux/i2c.h>
 
+#ifdef CONFIG_DEVFS_FS
+#include <linux/devfs_fs_kernel.h>
+#endif
+
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/ca.h>
 #include <linux/dvb/osd.h>
 #include <linux/dvb/net.h>
-#include <linux/mutex.h>
 
 #include "dvbdev.h"
 #include "demux.h"
@@ -124,7 +127,7 @@ struct av7110 {
        /* DEBI and polled command interface */
 
        spinlock_t              debilock;
-       struct mutex            dcomlock;
+       struct semaphore        dcomlock;
        volatile int            debitype;
        volatile int            debilen;
 
@@ -143,7 +146,7 @@ struct av7110 {
 
        int                     osdwin;      /* currently active window */
        u16                     osdbpp[8];
-       struct mutex            osd_mutex;
+       struct semaphore        osd_sema;
 
        /* CA */
 
@@ -169,7 +172,7 @@ struct av7110 {
        struct tasklet_struct   vpe_tasklet;
 
        int                     fe_synced;
-       struct mutex            pid_mutex;
+       struct semaphore        pid_mutex;
 
        int                     video_blank;
        struct video_status     videostate;