summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:24:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-07-15 07:24:22 -0300
commite1a86ef2de8867d886c75ae5308d17aa0f9a78df (patch)
tree5ad063b7efe38e3d766762e65a4a7f498cc8047e /v4l
parent5d42bf58c3798d11494482f0c4ce11e4264e5fab (diff)
parent7e35d0c788f864edd753b7d9b3e2289dde2dbce3 (diff)
downloadmediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.gz
mediapointer-dvb-s2-e1a86ef2de8867d886c75ae5308d17aa0f9a78df.tar.bz2
merge: http://kernellabs.com/hg/~dheitmueller/pinnacle_hybrid_2881
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