git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3e2e121
..
fafd25f
100644
(file)
--- a/
drivers/media/dvb/ttpci/av7110.h
+++ b/
drivers/media/dvb/ttpci/av7110.h
@@
-16,7
+16,6
@@
#include <linux/dvb/ca.h>
#include <linux/dvb/osd.h>
#include <linux/dvb/net.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"
#include "dvbdev.h"
#include "demux.h"
@@
-128,7
+127,7
@@
struct av7110 {
/* DEBI and polled command interface */
spinlock_t debilock;
/* DEBI and polled command interface */
spinlock_t debilock;
- struct
mutex
dcomlock;
+ struct
semaphore
dcomlock;
volatile int debitype;
volatile int debilen;
volatile int debitype;
volatile int debilen;
@@
-147,7
+146,7
@@
struct av7110 {
int osdwin; /* currently active window */
u16 osdbpp[8];
int osdwin; /* currently active window */
u16 osdbpp[8];
- struct
mutex osd_mutex
;
+ struct
semaphore osd_sema
;
/* CA */
/* CA */
@@
-173,7
+172,7
@@
struct av7110 {
struct tasklet_struct vpe_tasklet;
int fe_synced;
struct tasklet_struct vpe_tasklet;
int fe_synced;
- struct
mutex
pid_mutex;
+ struct
semaphore
pid_mutex;
int video_blank;
struct video_status videostate;
int video_blank;
struct video_status videostate;