summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:26:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:26:32 -0300
commitba8afb88f6d07d99b7e1a6a9d222327d72cdb280 (patch)
treee6d2b599b4ceaa03fd6ee5dc7819e107a776537e /v4l
parente18804d1a527fe032a9ca9c4ce0b19bcd1e4b9e5 (diff)
parent48df30f1907cbd15a643b8c334acf56dc7fe880a (diff)
downloadmediapointer-dvb-s2-ba8afb88f6d07d99b7e1a6a9d222327d72cdb280.tar.gz
mediapointer-dvb-s2-ba8afb88f6d07d99b7e1a6a9d222327d72cdb280.tar.bz2
merge: http://linuxtv.org/hg/~jfrancois/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.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 7e8e2fa6e..eb3597f76 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -1,6 +1,13 @@
# Use this for stuff for drivers that don't compile
[2.6.99]
+[2.6.31]
+# These rely on arch support that wasn't available until 2.6.31
+VIDEO_VPSS_SYSTEM
+VIDEO_VPFE_CAPTURE
+VIDEO_DM6446_CCDC
+VIDEO_DM355_CCDC
+
[2.6.29]
# Needs defines that are only available from 2.6.29
VIDEO_PXA27x