summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorMichael Krufky2008-04-22 19:45:14 +0200
committerMauro Carvalho Chehab2008-04-24 19:07:44 +0200
commit8efd2e28265ca031072d8d94cdbdd53904ce9b2d (patch)
tree9b2da1933412da1df2182f021dbf2f6d10e8c907 /drivers/media/video/cx88
parentV4L/DVB (7252): cx88: Add support for the Dvico PCI Nano (diff)
downloadkernel-qcow2-linux-8efd2e28265ca031072d8d94cdbdd53904ce9b2d.tar.gz
kernel-qcow2-linux-8efd2e28265ca031072d8d94cdbdd53904ce9b2d.tar.xz
kernel-qcow2-linux-8efd2e28265ca031072d8d94cdbdd53904ce9b2d.zip
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>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c3
-rw-r--r--drivers/media/video/cx88/cx88-video.c4
2 files changed, 5 insertions, 2 deletions
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[] = {
.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/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,
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 */