summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/Kconfig2
-rw-r--r--v4l/ChangeLog21
2 files changed, 22 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig
index 624e8808a..1bdfb540e 100644
--- a/linux/drivers/media/video/saa7134/Kconfig
+++ b/linux/drivers/media/video/saa7134/Kconfig
@@ -1,6 +1,6 @@
config VIDEO_SAA7134
tristate "Philips SAA7134 support"
- depends on VIDEO_DEV && PCI && I2C && SOUND
+ depends on VIDEO_DEV && PCI && I2C && SOUND && SND && SND_PCM_OSS
select VIDEO_BUF
select VIDEO_IR
select VIDEO_TUNER
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 48bfadb55..60dabc1d9 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,24 @@
+2005-11-10 22:40 mkrufky
+
+ * ../linux/drivers/media/video/saa7134/Kconfig:
+ - Prevent the following build warnings:
+
+ *** Warning: "snd_card_free"
+ *** Warning: "snd_card_register"
+ *** Warning: "snd_device_new"
+ *** Warning: "snd_card_new"
+ *** Warning: "snd_ctl_add"
+ *** Warning: "snd_ctl_new1"
+ *** Warning: "snd_pcm_set_ops"
+ *** Warning: "snd_pcm_new"
+ *** Warning: "snd_pcm_lib_ioctl"
+ *** Warning: "snd_pcm_hw_constraint_integer"
+ *** Warning: "snd_pcm_stop"
+ *** Warning: "snd_pcm_period_elapsed"
+ [drivers/media/video/saa7134/saa7134-alsa.ko] undefined!
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-10 22:24 mkrufky
* ../linux/drivers/media/video/em28xx/Kconfig: