summaryrefslogtreecommitdiff
path: root/v4l/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'v4l/ChangeLog')
-rw-r--r--v4l/ChangeLog13
1 files changed, 13 insertions, 0 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 8a36c23e7..fb2559e8a 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-20 17:05 rmcc
+
+ * linux/drivers/media/video/saa7134/saa7134-alsa.c:
+ (saa7134_alsa_init), (saa7134_alsa_exit):
+ * linux/drivers/media/video/saa7134/saa7134-oss.c:
+ (saa7134_oss_init), (saa7134_oss_exit):
+
+ - Fixed the saa7134 hotplug notifiers to prevent collisions between
+ ALSA and OSS
+ - Prevent ALSA or OSS from loading if the other is present.
+
+ Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
+
2005-12-20 15:54 mkrufky
* linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c: