summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx18/cx18-driver.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-09 15:34:06 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-09 15:34:06 -0200
commit5799331703b7837fcfbef38d643300b2b8da0ba6 (patch)
treeaf842050c6bbc27e74a055bb6899cc409cde63d7 /linux/drivers/media/video/cx18/cx18-driver.h
parentf9263f9b94e9a6f28065616efc07eb78d000a662 (diff)
parentfeaba1cfa7f4825040ea17cec9408f3a4bba6dbd (diff)
downloadmediapointer-dvb-s2-5799331703b7837fcfbef38d643300b2b8da0ba6.tar.gz
mediapointer-dvb-s2-5799331703b7837fcfbef38d643300b2b8da0ba6.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-sliced-vbi
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.h')
-rw-r--r--linux/drivers/media/video/cx18/cx18-driver.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h
index 20189283a..7fc914c52 100644
--- a/linux/drivers/media/video/cx18/cx18-driver.h
+++ b/linux/drivers/media/video/cx18/cx18-driver.h
@@ -487,7 +487,6 @@ struct cx18 {
unsigned long i_flags; /* global cx18 flags */
atomic_t ana_capturing; /* count number of active analog capture streams */
atomic_t tot_capturing; /* total count number of active capture streams */
- spinlock_t lock; /* lock access to this struct */
int search_pack_header;
int open_id; /* incremented each time an open occurs, used as