summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/saa7134/Kconfig3
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/Kconfig b/linux/drivers/media/video/saa7134/Kconfig
index 1bdfb540e..7bdeabe63 100644
--- a/linux/drivers/media/video/saa7134/Kconfig
+++ b/linux/drivers/media/video/saa7134/Kconfig
@@ -1,10 +1,11 @@
config VIDEO_SAA7134
tristate "Philips SAA7134 support"
- depends on VIDEO_DEV && PCI && I2C && SOUND && SND && SND_PCM_OSS
+ depends on VIDEO_DEV && PCI && I2C && SOUND && SND
select VIDEO_BUF
select VIDEO_IR
select VIDEO_TUNER
select CRC32
+ select SND_PCM_OSS
---help---
This is a video4linux driver for Philips SAA713x based
TV cards.
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 6ea5e0ea4..6a97ecd4e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-11 15:39 mkrufky
+
+ * ../linux/drivers/media/video/saa7134/Kconfig:
+ - Don't DEPEND on SND_PCM_OSS. Instead, SELECT it.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-11-11 09:36 nshmyrev
* ../linux/drivers/media/video/compat_ioctl32.c: