diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 8 | ||||
| -rw-r--r-- | drivers/media/video/tveeprom.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index b1afc6c2d37..a2c0794821b 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -587,11 +587,11 @@ void em28xx_card_setup(struct em28xx *dev) /* request some modules */ switch (dev->model) { case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: + case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: { struct tveeprom tv; #ifdef CONFIG_MODULES request_module("tveeprom"); - request_module("ir-kbd-i2c"); #endif /* Call first TVeeprom */ @@ -603,6 +603,12 @@ void em28xx_card_setup(struct em28xx *dev) dev->i2s_speed = 2048000; dev->has_msp34xx = 1; } +#ifdef CONFIG_MODULES + if (tv.has_ir) + request_module("ir-kbd-i2c"); +#endif + /* FIXME: Should also retrieve decoder processor type */ + break; } case EM2820_BOARD_KWORLD_PVRTV2800RF: diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 0faa1499235..403fbd0afa3 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c @@ -226,7 +226,7 @@ hauppauge_tuner[] = { TUNER_ABSENT, "TCL M2523_3DI_E"}, { TUNER_ABSENT, "Samsung THPD5222FG30A"}, /* 120-129 */ - { TUNER_ABSENT, "Xceive XC3028"}, + { TUNER_XC2028, "Xceive XC3028"}, { TUNER_ABSENT, "Philips FQ1216LME MK5"}, { TUNER_ABSENT, "Philips FQD1216LME"}, { TUNER_ABSENT, "Conexant CX24118A"}, |