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>

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 79c166a7f230e8d64f125c52888fcf35e67895df..7d48e3dbd074b1f64b882ae60ed2eca838a1327d 100644 (file)
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -57,4 +57,4 @@
  56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]
  57 -> ADS Tech Instant Video PCI                          [1421:0390]
  58 -> Pinnacle PCTV HD 800i                               [11bd:0051]
- 59 -> DVICO HDTV5 PCI Nano                                [18ac:d530]
+ 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 23b58bc9cf2bea5efc40820e8e8884ebff873b02..a1756c6c6dca056a6e41d7137b05c6a0dc78c8fe 100644 (file)
--- 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 c30356bb35e977a3ce5dd482c8c53babd1de92c7..191577d166aaef193c2242e95d183bf688191e97 100644 (file)
--- 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 */