summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-11 18:17:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-11 18:17:50 -0300
commitfd4694cdbe15f591792ec5166c3d9791c4b1e34f (patch)
tree99866153be11055c726828017b089a40e7f8daa1 /v4l
parent4b038fe7fa0a646fedf0e49aa2bfba38c814e3ad (diff)
parentaaaaa6a00dd372109ceb39c63aef9088ec86e344 (diff)
downloadmediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.gz
mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.bz2
merge: http://linuxtv.org/hg/~awalls/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.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 1e3527dc0..3c57c14bd 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -4,9 +4,6 @@
[2.6.29]
# Needs defines that are only available from 2.6.29
VIDEO_PXA27x
-# Needs the newer I2C binding model
-VIDEO_ADV7343
-VIDEO_THS7303
[2.6.28]
USB_STV06XX
@@ -16,6 +13,8 @@ USB_STV06XX
VIDEO_TVP514X
# requires id_table and new i2c stuff
RADIO_TEA5764
+VIDEO_THS7303
+VIDEO_ADV7343
[2.6.25]
# Requires gpiolib