From 9092a672ca84b9625c2f7ed1ec5479505baffdb0 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 25 Sep 2006 12:43:42 -0300 Subject: Ensure the WM8775 driver is loaded generically for any board. From: Steven Toth A generic change to cards to allow any board to specify whether it needs the wm8775 module loaded (by the core) or not. Signed-off-by: Steven Toth --- linux/drivers/media/video/cx88/cx88-cards.c | 1 + linux/drivers/media/video/cx88/cx88-video.c | 3 +++ linux/drivers/media/video/cx88/cx88.h | 2 ++ 3 files changed, 6 insertions(+) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 6478e13d6..f15233766 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1320,6 +1320,7 @@ struct cx88_board cx88_boards[] = { .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET, .tda9887_conf = TDA9887_PRESENT, + .audio_chip = AUDIO_CHIP_WM8775, .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 836f0e7a5..9782a3799 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -2225,6 +2225,9 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, if (TUNER_ABSENT != core->tuner_type) request_module("tuner"); + if (cx88_boards[ core->board ].audio_chip == AUDIO_CHIP_WM8775) + request_module("wm8775"); + /* register v4l devices */ dev->video_dev = cx88_vdev_init(core,dev->pci, &cx8800_video_template,"video"); diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 88338673c..f46721123 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -30,6 +30,7 @@ #include #include #include +#include #ifdef HAVE_VIDEO_BUF_DVB #include #endif @@ -240,6 +241,7 @@ struct cx88_board { struct cx88_input radio; unsigned int blackbird:1; unsigned int dvb:1; + enum audiochip audio_chip; }; struct cx88_subid { -- cgit v1.2.3