summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-28 18:26:47 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-28 18:26:47 -0300
commitd68ee89d910d886efc330882172f989d5ba42736 (patch)
treee4776a018f93bc856a01ca3def4b2182a23f3f36 /linux
parent4d636052ea38930cfc163f13bc833a2d40e420da (diff)
parent08e66b521fa213ce0eeb13db0ae6d3e61d0fc699 (diff)
downloadmediapointer-dvb-s2-d68ee89d910d886efc330882172f989d5ba42736.tar.gz
mediapointer-dvb-s2-d68ee89d910d886efc330882172f989d5ba42736.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-cx18
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/mt9m001.c2
-rw-r--r--linux/drivers/media/video/mt9v022.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/mt9m001.c b/linux/drivers/media/video/mt9m001.c
index 3fb5f63df..04864cf25 100644
--- a/linux/drivers/media/video/mt9m001.c
+++ b/linux/drivers/media/video/mt9m001.c
@@ -372,7 +372,7 @@ static int mt9m001_set_register(struct soc_camera_device *icd,
}
#endif
-const struct v4l2_queryctrl mt9m001_controls[] = {
+static const struct v4l2_queryctrl mt9m001_controls[] = {
{
.id = V4L2_CID_VFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,
diff --git a/linux/drivers/media/video/mt9v022.c b/linux/drivers/media/video/mt9v022.c
index d4b9e2744..597df6582 100644
--- a/linux/drivers/media/video/mt9v022.c
+++ b/linux/drivers/media/video/mt9v022.c
@@ -452,7 +452,7 @@ static int mt9v022_set_register(struct soc_camera_device *icd,
}
#endif
-const struct v4l2_queryctrl mt9v022_controls[] = {
+static const struct v4l2_queryctrl mt9v022_controls[] = {
{
.id = V4L2_CID_VFLIP,
.type = V4L2_CTRL_TYPE_BOOLEAN,