aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--drivers/media/video/em28xx/em28xx.h6
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 615cf362e79c..2b27460dae35 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1244,6 +1244,7 @@ struct em28xx_board em28xx_boards[] = {
1244 .tuner_type = TUNER_LG_PAL_NEW_TAPC, 1244 .tuner_type = TUNER_LG_PAL_NEW_TAPC,
1245 .tda9887_conf = TDA9887_PRESENT, 1245 .tda9887_conf = TDA9887_PRESENT,
1246 .decoder = EM28XX_TVP5150, 1246 .decoder = EM28XX_TVP5150,
1247 .adecoder = EM28XX_TVAUDIO,
1247 .input = { { 1248 .input = { {
1248 .type = EM28XX_VMUX_TELEVISION, 1249 .type = EM28XX_VMUX_TELEVISION,
1249 .vmux = TVP5150_COMPOSITE0, 1250 .vmux = TVP5150_COMPOSITE0,
@@ -1917,6 +1918,8 @@ void em28xx_card_setup(struct em28xx *dev)
1917 request_module("tvp5150"); 1918 request_module("tvp5150");
1918 if (dev->board.tuner_type != TUNER_ABSENT) 1919 if (dev->board.tuner_type != TUNER_ABSENT)
1919 request_module("tuner"); 1920 request_module("tuner");
1921 if (dev->board.adecoder == EM28XX_TVAUDIO)
1922 request_module("tvaudio");
1920#endif 1923#endif
1921 1924
1922 em28xx_config_tuner(dev); 1925 em28xx_config_tuner(dev);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 3e82d818c0cd..89a793cb8ca4 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -357,6 +357,11 @@ enum em28xx_decoder {
357 EM28XX_SAA711X, 357 EM28XX_SAA711X,
358}; 358};
359 359
360enum em28xx_adecoder {
361 EM28XX_NOADECODER = 0,
362 EM28XX_TVAUDIO,
363};
364
360struct em28xx_board { 365struct em28xx_board {
361 char *name; 366 char *name;
362 int vchannels; 367 int vchannels;
@@ -382,6 +387,7 @@ struct em28xx_board {
382 unsigned char xclk, i2c_speed; 387 unsigned char xclk, i2c_speed;
383 388
384 enum em28xx_decoder decoder; 389 enum em28xx_decoder decoder;
390 enum em28xx_adecoder adecoder;
385 391
386 struct em28xx_input input[MAX_EM28XX_INPUT]; 392 struct em28xx_input input[MAX_EM28XX_INPUT];
387 struct em28xx_input radio; 393 struct em28xx_input radio;