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:15:17 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-09 15:15:17 -0200
commitfeaba1cfa7f4825040ea17cec9408f3a4bba6dbd (patch)
treed49aff3d69589f8f24c9b0fd9f6c6dda5f325bae /linux/drivers/media/video/cx18/cx18-driver.h
parent3fd8c59cdeaedaa51a5db45b8dbf67dc6b907e19 (diff)
parent527d5f186187cc1a8c128b0aca06d047e7f753a4 (diff)
downloadmediapointer-dvb-s2-feaba1cfa7f4825040ea17cec9408f3a4bba6dbd.tar.gz
mediapointer-dvb-s2-feaba1cfa7f4825040ea17cec9408f3a4bba6dbd.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18
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 3a21013cd..d95c6ace2 100644
--- a/linux/drivers/media/video/cx18/cx18-driver.h
+++ b/linux/drivers/media/video/cx18/cx18-driver.h
@@ -429,7 +429,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