diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-04-22 13:45:14 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:44 -0400 |
commit | 8efd2e28265ca031072d8d94cdbdd53904ce9b2d (patch) | |
tree | 9b2da1933412da1df2182f021dbf2f6d10e8c907 | |
parent | 5c00fac0bab95a378e60c1a67e3d3c5ac44df412 (diff) |
V4L/DVB (7254): cx88: fix FusionHDTV 5 PCI nano name and enable IR support
load ir-kbd-i2c for IR remote control support on DViCO FusionHDTV 5 PCI nano
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | Documentation/video4linux/CARDLIST.cx88 | 2 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 3 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88 index 79c166a7f230..7d48e3dbd074 100644 --- a/Documentation/video4linux/CARDLIST.cx88 +++ b/Documentation/video4linux/CARDLIST.cx88 | |||
@@ -57,4 +57,4 @@ | |||
57 | 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602] | 57 | 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder [0070:9600,0070:9601,0070:9602] |
58 | 57 -> ADS Tech Instant Video PCI [1421:0390] | 58 | 57 -> ADS Tech Instant Video PCI [1421:0390] |
59 | 58 -> Pinnacle PCTV HD 800i [11bd:0051] | 59 | 58 -> Pinnacle PCTV HD 800i [11bd:0051] |
60 | 59 -> DVICO HDTV5 PCI Nano [18ac:d530] | 60 | 59 -> DViCO FusionHDTV 5 PCI nano [18ac:d530] |
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index 23b58bc9cf2b..a1756c6c6dca 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
@@ -1402,7 +1402,8 @@ static const struct cx88_board cx88_boards[] = { | |||
1402 | .mpeg = CX88_MPEG_DVB, | 1402 | .mpeg = CX88_MPEG_DVB, |
1403 | }, | 1403 | }, |
1404 | [CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = { | 1404 | [CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = { |
1405 | .name = "DVICO HDTV5 PCI Nano", | 1405 | .name = "DViCO FusionHDTV 5 PCI nano", |
1406 | /* xc3008 tuner, digital only for now */ | ||
1406 | .tuner_type = TUNER_ABSENT, | 1407 | .tuner_type = TUNER_ABSENT, |
1407 | .radio_type = UNSET, | 1408 | .radio_type = UNSET, |
1408 | .tuner_addr = ADDR_UNSET, | 1409 | .tuner_addr = ADDR_UNSET, |
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index c30356bb35e9..191577d166aa 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -1832,8 +1832,10 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, | |||
1832 | 1832 | ||
1833 | switch (core->boardnr) { | 1833 | switch (core->boardnr) { |
1834 | case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD: | 1834 | case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD: |
1835 | request_module("ir-kbd-i2c"); | ||
1836 | request_module("rtc-isl1208"); | 1835 | request_module("rtc-isl1208"); |
1836 | /* break intentionally omitted */ | ||
1837 | case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO: | ||
1838 | request_module("ir-kbd-i2c"); | ||
1837 | } | 1839 | } |
1838 | 1840 | ||
1839 | /* register v4l devices */ | 1841 | /* register v4l devices */ |