summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-15 14:15:33 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-15 14:15:33 -0300
commita2aa04e72cd03545056bd4a9a7cdd6b340908ca2 (patch)
tree88c1ef6c2b2289b4ef3f9d1bbe5cfd5efc9696ae /v4l
parent0a6e7fde238f94e6a9d873258e77baa775942b81 (diff)
parent19feaccb78f2227bb372389fe38dcdafa0880bb0 (diff)
downloadmediapointer-dvb-s2-a2aa04e72cd03545056bd4a9a7cdd6b340908ca2.tar.gz
mediapointer-dvb-s2-a2aa04e72cd03545056bd4a9a7cdd6b340908ca2.tar.bz2
merge: http://www.linuxtv.org/hg/~dougsland/em28xx
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