diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-01 10:43:46 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-01 10:43:46 -0300 |
commit | 698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b (patch) | |
tree | bc02cf9d1a9365c1230fc7702fad5f4305b7eb59 /v4l | |
parent | c72ee0800635eed6f921b1597ebeabde51e195a4 (diff) | |
parent | 158fd570dbf7a826c6578d5b5a9036dc58059371 (diff) | |
download | mediapointer-dvb-s2-698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b.tar.gz mediapointer-dvb-s2-698b8c69f36ebfd0fe56ee02d9f6a4507129eb3b.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/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.txt | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/v4l/versions.txt b/v4l/versions.txt index d4c7bd380..1995c9006 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -12,6 +12,17 @@ VIDEO_DM355_CCDC # Needs defines that are only available from 2.6.29 VIDEO_PXA27x +[2.6.28] +# dev_get_drvdata switched to const struct device * +SOC_CAMERA +SOC_CAMERA_MT9V022 +SOC_CAMERA_MT9M001 +SOC_CAMERA_MT9M111 +SOC_CAMERA_MT9T031 +SOC_CAMERA_OV772X +SOC_CAMERA_TW9910 +SOC_CAMERA_PLATFORM + [2.6.26] # Requires struct i2c_device_id VIDEO_TVP514X @@ -19,12 +30,8 @@ VIDEO_TVP514X RADIO_TEA5764 VIDEO_THS7303 VIDEO_ADV7343 - -[2.6.25] -# Requires gpiolib -SOC_CAMERA -SOC_CAMERA_MT9V022 -SOC_CAMERA_MT9M001 +RADIO_SI4713 +I2C_SI4713 [2.6.24] # Some freezer routines |