From 252c40b219b9e32a8e39ee00ea92ab4f8e8a02b6 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@hauppauge.com>
Date: Mon, 25 Sep 2006 12:43:42 -0300
Subject: [PATCH] --- yaml --- r: 38256 b: refs/heads/master c:
 3057906df5c9be9c99a181eccac3bc40cf07ad9f h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-cards.c | 1 +
 trunk/drivers/media/video/cx88/cx88-video.c | 3 +++
 trunk/drivers/media/video/cx88/cx88.h       | 2 ++
 trunk/include/media/audiochip.h             | 4 +++-
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2cb1afc77a7f..2b1d1705fd27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba7e6f3e3e639de2597afffaae3fda75f6e6082d
+refs/heads/master: 3057906df5c9be9c99a181eccac3bc40cf07ad9f
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 6214eb823b29..425d15df9d07 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -1287,6 +1287,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/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c
index fbc79e9842aa..cb0c0eea20f9 100644
--- a/trunk/drivers/media/video/cx88/cx88-video.c
+++ b/trunk/drivers/media/video/cx88/cx88-video.c
@@ -1928,6 +1928,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/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index 89f12e273b7f..2371ab407984 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -30,6 +30,7 @@
 #include <media/tveeprom.h>
 #include <media/video-buf.h>
 #include <media/cx2341x.h>
+#include <media/audiochip.h>
 #include <media/video-buf-dvb.h>
 
 #include "btcx-risc.h"
@@ -232,6 +233,7 @@ struct cx88_board {
 	struct cx88_input       radio;
 	unsigned int            blackbird:1;
 	unsigned int            dvb:1;
+	enum audiochip          audio_chip;
 };
 
 struct cx88_subid {
diff --git a/trunk/include/media/audiochip.h b/trunk/include/media/audiochip.h
index 1fd4a2207574..db8823d45a7d 100644
--- a/trunk/include/media/audiochip.h
+++ b/trunk/include/media/audiochip.h
@@ -18,7 +18,9 @@ enum audiochip {
 	AUDIO_CHIP_TDA9874,
 	AUDIO_CHIP_PIC16C54,
 	/* Provided by msp3400.c */
-	AUDIO_CHIP_MSP34XX
+	AUDIO_CHIP_MSP34XX,
+	/* Provided by wm8775.c */
+	AUDIO_CHIP_WM8775
 };
 
 #endif /* AUDIOCHIP_H */