summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-01 01:38:01 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-01 01:38:01 -0300
commit0a6ce90779f4a12f8e75009d19209a4ee48707d8 (patch)
tree9a8f2fdd6293a1cf8e281789ab3ba7b2f92384b8 /v4l
parentabed55d1925015d07d0afd92eb50a0b2df2eca27 (diff)
parente523ddb42e0588210df880e0e32f0de801803e94 (diff)
downloadmediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.gz
mediapointer-dvb-s2-0a6ce90779f4a12f8e75009d19209a4ee48707d8.tar.bz2
merge: http://kernellabs.com/hg/~mkrufky/sms1xxx-unbreak
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.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 7e8e2fa6e..01b553d6c 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
@@ -19,6 +26,10 @@ SOC_CAMERA
SOC_CAMERA_MT9V022
SOC_CAMERA_MT9M001
+[2.6.24]
+# Some freezer routines
+USB_GSPCA_SN9C20X_EVDEV
+
[2.6.23]
# Needs field intf_assoc in struct usb_host_config
VIDEO_CX231XX