3 files changed, 13 insertions, 14 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index 5761c38cd..c448cb158 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1,7 +1,7 @@
 /*
  *   SAA713x ALSA support for V4L
  *
- *   $Id: saa7134-alsa.c,v 1.33 2005/12/21 22:47:35 rmcc Exp $
+ *   $Id: saa7134-alsa.c,v 1.34 2005/12/26 15:14:45 mchehab Exp $
  *
  *   Caveats:
  *        - Volume doesn't work (it's always at max)
@@ -1046,12 +1046,7 @@ static void saa7134_alsa_exit(void)
 	return;
 }
 
-/*
-   This is here as a temporary fix until the sound core is loaded earlier
-   in the boot process. It should be
-module_init(saa7134_alsa_init);
-*/
-
+/* We initialize this late, to make sure the sound system is up and running */
 late_initcall(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c
index 6bb452c09..a3c6444bc 100644
--- a/linux/drivers/media/video/saa7134/saa7134-oss.c
+++ b/linux/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
 /*
- * $Id: saa7134-oss.c,v 1.33 2005/12/21 22:47:35 rmcc Exp $
+ * $Id: saa7134-oss.c,v 1.34 2005/12/26 15:14:45 mchehab Exp $
  *
  * device driver for philips saa7134 based TV cards
  * oss dsp interface
@@ -1034,12 +1034,7 @@ static void saa7134_oss_exit(void)
 	return;
 }
 
-/*
-   This is here as a temporary fix until the sound core is loaded earlier
-   in the boot process. It should be
-module_init(saa7134_oss_init);
-*/
-
+/* We initialize this late, to make sure the sound system is up and running */
 late_initcall(saa7134_oss_init);
 module_exit(saa7134_oss_exit);
 MODULE_LICENSE("GPL");
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 9311daa41..5629ef9f2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-26 15:11  mchehab
+
+	* linux/drivers/media/video/saa7134/saa7134-alsa.c:
+	* linux/drivers/media/video/saa7134/saa7134-oss.c:
+	- Make late module load fix looking the same as kernel version.
+	- kernel-sync.
+
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-12-26 13:57  mchehab
 
 	* linux/drivers/media/video/tvp5150.c: (tvp5150_command):