summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ovcamchip
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-09-05 10:08:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-09-05 10:08:45 -0300
commit9aa2d22f827055231502b339af60044582cc67c3 (patch)
treebd801419e69534d0042bf447a6bf0ed8c899f3a0 /linux/drivers/media/video/ovcamchip
parent9a68ced75fe38c14a4277067c4fcaeaf205b06ee (diff)
parent89bf8cd11f914eff585c23797fd88a641b9cb3dd (diff)
downloadmediapointer-dvb-s2-9aa2d22f827055231502b339af60044582cc67c3.tar.gz
mediapointer-dvb-s2-9aa2d22f827055231502b339af60044582cc67c3.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ovcamchip')
-rw-r--r--linux/drivers/media/video/ovcamchip/ovcamchip_core.c6
-rw-r--r--linux/drivers/media/video/ovcamchip/ovcamchip_priv.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/ovcamchip/ovcamchip_core.c b/linux/drivers/media/video/ovcamchip/ovcamchip_core.c
index 065c24541..2c4acbf5a 100644
--- a/linux/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/linux/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -49,12 +49,6 @@ MODULE_LICENSE("GPL");
#define GENERIC_REG_ID_LOW 0x1D /* manufacturer ID LSB */
#define GENERIC_REG_COM_I 0x29 /* misc ID bits */
-extern struct ovcamchip_ops ov6x20_ops;
-extern struct ovcamchip_ops ov6x30_ops;
-extern struct ovcamchip_ops ov7x10_ops;
-extern struct ovcamchip_ops ov7x20_ops;
-extern struct ovcamchip_ops ov76be_ops;
-
static char *chip_names[NUM_CC_TYPES] = {
[CC_UNKNOWN] = "Unknown chip",
[CC_OV76BE] = "OV76BE",
diff --git a/linux/drivers/media/video/ovcamchip/ovcamchip_priv.h b/linux/drivers/media/video/ovcamchip/ovcamchip_priv.h
index 9afa4fe47..a05650fae 100644
--- a/linux/drivers/media/video/ovcamchip/ovcamchip_priv.h
+++ b/linux/drivers/media/video/ovcamchip/ovcamchip_priv.h
@@ -53,6 +53,12 @@ struct ovcamchip {
int initialized; /* OVCAMCHIP_CMD_INITIALIZE was successful */
};
+extern struct ovcamchip_ops ov6x20_ops;
+extern struct ovcamchip_ops ov6x30_ops;
+extern struct ovcamchip_ops ov7x10_ops;
+extern struct ovcamchip_ops ov7x20_ops;
+extern struct ovcamchip_ops ov76be_ops;
+
/* --------------------------------- */
/* I2C I/O */
/* --------------------------------- */