summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-02-17 00:10:25 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2008-02-17 00:10:25 -0500
commit71b2f3e4c3cb8b646bc1afb0175861cc10891840 (patch)
tree49594758ec474cc0fc192f1d5bd06bc09861cb7f /linux/drivers/media/video
parent381bcd3aa9c4c844cb415342a0ab21622c596488 (diff)
downloadmediapointer-dvb-s2-71b2f3e4c3cb8b646bc1afb0175861cc10891840.tar.gz
mediapointer-dvb-s2-71b2f3e4c3cb8b646bc1afb0175861cc10891840.tar.bz2
cx88: fix FusionHDTV 5 PCI nano name and enable IR support
From: Michael Krufky <mkrufky@linuxtv.org> load ir-kbd-i2c for IR remote control support on DViCO FusionHDTV 5 PCI nano Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c3
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 8a2dc855b..6de9e9f30 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1448,7 +1448,8 @@ static const struct cx88_board cx88_boards[] = {
.mpeg = CX88_MPEG_DVB,
},
[CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = {
- .name = "DVICO HDTV5 PCI Nano",
+ .name = "DViCO FusionHDTV 5 PCI nano",
+ /* xc3008 tuner, digital only for now */
.tuner_type = TUNER_ABSENT,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index b80236f04..190bc97b4 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -2127,8 +2127,10 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
switch (core->boardnr) {
case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD:
- request_module("ir-kbd-i2c");
request_module("rtc-isl1208");
+ /* break intentionally omitted */
+ case CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO:
+ request_module("ir-kbd-i2c");
}
/* register v4l devices */