summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/mt9v022.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 22:19:36 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-26 22:19:36 -0300
commite46833c20d935275819ec7699848db8bf7fc95c6 (patch)
tree6bc18657f5b3ea20ebad3d7800380a953b911278 /linux/drivers/media/video/mt9v022.c
parent2ea01ce1b95e74d54c08e88437218f26d2f5ac87 (diff)
parent9f6504985990a61609caaa94fac0724d11be4803 (diff)
downloadmediapointer-dvb-s2-e46833c20d935275819ec7699848db8bf7fc95c6.tar.gz
mediapointer-dvb-s2-e46833c20d935275819ec7699848db8bf7fc95c6.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/mt9v022.c')
-rw-r--r--linux/drivers/media/video/mt9v022.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/mt9v022.c b/linux/drivers/media/video/mt9v022.c
index 9601884ca..59efb8ff0 100644
--- a/linux/drivers/media/video/mt9v022.c
+++ b/linux/drivers/media/video/mt9v022.c
@@ -336,7 +336,7 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
return SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |
- SOCAM_MASTER | SOCAM_SLAVE |
+ SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_SLAVE |
width_flag;
}