diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-cards.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 07ef5ab25..1e136a354 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -386,7 +386,16 @@ struct cx88_board cx88_boards[] = { #endif }, [CX88_BOARD_HAUPPAUGE_DVB_T1] = { - .name = "Hauppuage Nova-T DVB-t", + .name = "Hauppauge Nova-T DVB-T", + .tuner_type = UNSET, + .input = {{ + .type = CX88_VMUX_DVB, + .vmux = 0, + }}, + .dvb = 1, + }, + [CX88_BOARD_CONEXANT_DVB_T1] = { + .name = "Conexant DVB-T reference design", .tuner_type = UNSET, .input = {{ .type = CX88_VMUX_DVB, @@ -473,6 +482,10 @@ struct cx88_subid cx88_subids[] = { .subvendor = 0x0070, .subdevice = 0x9002, .card = CX88_BOARD_HAUPPAUGE_DVB_T1, + },{ + .subvendor = 0x14f1, + .subdevice = 0x0187, + .card = CX88_BOARD_CONEXANT_DVB_T1, } }; const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids); @@ -590,7 +603,8 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) printk(KERN_INFO "%s: hauppauge eeprom: model=%d, " "tuner=%s (%d), radio=%s\n", - core->name, model, hauppauge_tuner[tuner].name, + core->name, model, (tuner < ARRAY_SIZE(hauppauge_tuner) + ? hauppauge_tuner[tuner].name : "?"), core->tuner_type, radio ? "yes" : "no"); } |