summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2009-01-12 12:19:34 +0100
committerJean-Francois Moine <moinejf@free.fr>2009-01-12 12:19:34 +0100
commit5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b (patch)
tree4eb73e439cb8ec26b86388335dd62d9cc4efb530 /v4l
parent07204c883fe47f8936c1288e11252a14173dce1e (diff)
parent60514cdd01298455a98066edd16a562ee2750ce7 (diff)
downloadmediapointer-dvb-s2-5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b.tar.gz
mediapointer-dvb-s2-5e73f51f9d1edd9da966f2b46e3b08b8c9bb6c5b.tar.bz2
merge: v4l-dvb
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