summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran/zoran_card.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-12 03:35:21 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-12 03:35:21 -0200
commit60514cdd01298455a98066edd16a562ee2750ce7 (patch)
tree65b35f1e0c3d0409953c0dcc0a4ae23d296ddb2a /linux/drivers/media/video/zoran/zoran_card.h
parenta7eec9c2d5f8725340da03c5509bf04980a03072 (diff)
parent35c197df8426969847c1a23741d5b3f723e07354 (diff)
downloadmediapointer-dvb-s2-60514cdd01298455a98066edd16a562ee2750ce7.tar.gz
mediapointer-dvb-s2-60514cdd01298455a98066edd16a562ee2750ce7.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx88
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
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;