summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 23:13:12 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-12 23:13:12 -0300
commit1340daf098275689f8220222447a84e4ec4263b6 (patch)
tree66f046b589159961291121b8e9384ff8fb3342da /v4l
parent6716df924ee6f2791b1939b04028f01dd37a9e9e (diff)
parent0efc193045eedcc05a28b5502f6dfaed87b434e8 (diff)
downloadmediapointer-dvb-s2-1340daf098275689f8220222447a84e4ec4263b6.tar.gz
mediapointer-dvb-s2-1340daf098275689f8220222447a84e4ec4263b6.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/lgdt3305
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/versions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 369cbb15d..b4869a157 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -20,6 +20,10 @@ SOC_CAMERA
SOC_CAMERA_MT9V022
SOC_CAMERA_MT9M001
+[2.6.23]
+# Needs field intf_assoc in struct usb_host_config
+VIDEO_CX231XX
+
[2.6.22]
#This driver requires I2C probe/remove fields
VIDEO_TCM825X