summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran/zoran_card.h
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-01-12 12:19:34 +0100
committerJean-Francois Moine <moinejf@free.fr>2009-01-12 12:19:34 +0100
commit5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b (patch)
tree4eb73e439cb8ec26b86388335dd62d9cc4efb530 /linux/drivers/media/video/zoran/zoran_card.h
parent07204c883fe47f8936c1288e11252a14173dce1e (diff)
parent60514cdd01298455a98066edd16a562ee2750ce7 (diff)
downloadmediapointer-dvb-s2-5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b.tar.gz
mediapointer-dvb-s2-5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/zoran/zoran_card.h')
-rw-r--r--linux/drivers/media/video/zoran/zoran_card.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_card.h b/linux/drivers/media/video/zoran/zoran_card.h
index e4dc9d29b..c989448a7 100644
--- a/linux/drivers/media/video/zoran/zoran_card.h
+++ b/linux/drivers/media/video/zoran/zoran_card.h
@@ -40,7 +40,7 @@ extern int zr36067_debug;
/* Anybody who uses more than four? */
#define BUZ_MAX 4
-extern int zoran_num;
+extern atomic_t zoran_num;
extern struct zoran *zoran[BUZ_MAX];
extern struct video_device zoran_template;