summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-cards.c
diff options
context:
space:
mode:
authorAndy Walls <awalls@radix.net>2009-11-21 12:52:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 18:41:56 -0200
commitad2fe2d48812029b0b674594f297d0723f7c6e8f (patch)
tree4313d3213c527573943bde2231aedff486529154 /drivers/media/video/ivtv/ivtv-cards.c
parentbfbde8ee56d4a19e2d36a5a24b6dbfd298298bf1 (diff)
downloadblackbird-op-linux-ad2fe2d48812029b0b674594f297d0723f7c6e8f.tar.gz
blackbird-op-linux-ad2fe2d48812029b0b674594f297d0723f7c6e8f.zip
V4L/DVB (13444): ivtv: Add explicit IR controller initialization for the AVerTV M116
Add explicit support for the AVerTV M116 for use with the ir-kbd-i2c module. This also eases future support for other AVerMedia ivtv boards with the same microcontroller program at I2C address 0x40. This is a reworked version of an earlier patch that was... Reviewed-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andy Walls <awalls@radix.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-cards.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-cards.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c
index e15c153b3012..e98ecadfde29 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -955,7 +955,8 @@ static const struct ivtv_card ivtv_card_avertv_mce116 = {
.hw_video = IVTV_HW_CX25840,
.hw_audio = IVTV_HW_CX25840,
.hw_audio_ctrl = IVTV_HW_CX25840,
- .hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER | IVTV_HW_WM8739,
+ .hw_all = IVTV_HW_CX25840 | IVTV_HW_TUNER | IVTV_HW_WM8739 |
+ IVTV_HW_I2C_IR_RX_AVER,
.video_inputs = {
{ IVTV_CARD_INPUT_VID_TUNER, 0, CX25840_COMPOSITE2 },
{ IVTV_CARD_INPUT_SVIDEO1, 1, CX25840_SVIDEO3 },
OpenPOWER on IntegriCloud