summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-12 03:30:56 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-12 03:30:56 -0200
commit35c197df8426969847c1a23741d5b3f723e07354 (patch)
treebba8ebea0be0ae414aaa5e56f60179030044579d /v4l
parentf6c316d761d2686a153d7de7a83118c35b7cb494 (diff)
parent682ea867d9eec7d10d92eaf805693ded0ec20d64 (diff)
downloadmediapointer-dvb-s2-35c197df8426969847c1a23741d5b3f723e07354.tar.gz
mediapointer-dvb-s2-35c197df8426969847c1a23741d5b3f723e07354.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 'v4l')
-rw-r--r--v4l/versions.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 722a9283a..11b6004a6 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -4,9 +4,11 @@
[2.6.28]
USB_STV06XX
-[2.6.26]
-# Needs camera.h
+[2.6.27]
+# Needs struct pxa_dma_desc
VIDEO_PXA27x
+
+[2.6.26]
# Requires struct i2c_device_id
VIDEO_TVP514X
# requires id_table and new i2c stuff