5 files changed, 21 insertions, 12 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index 7ca059211..e2538242e 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -39,10 +39,7 @@
 #include "cx25840.h"
 
 MODULE_DESCRIPTION("Conexant CX25840 audio/video decoder driver");
-MODULE_AUTHOR("Ulf Eklund <ivtv@eklund.to>");
-MODULE_AUTHOR("Chris Kennedy <c@groovy.org>");
-MODULE_AUTHOR("Hans Verkuil <hverkuil@xs4all.nl>");
-MODULE_AUTHOR("Tyler Trafford <tatrafford@comcast.net>");
+MODULE_AUTHOR("Ulf Eklund, Chris Kennedy, Hans Verkuil, Tyler Trafford");
 MODULE_LICENSE("GPL");
 
 static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index dbdb1f1b6..fdf70c3d7 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -43,10 +43,7 @@
 #include <media/v4l2-common.h>
 
 MODULE_DESCRIPTION("Philips SAA7114/SAA7115 video decoder driver");
-MODULE_AUTHOR("Maxim Yevtyushkin <max@linuxmedialabs.com>");
-MODULE_AUTHOR("Kevin Thayer <nufan_wfk@yahoo.com>");
-MODULE_AUTHOR("Chris Kennedy <c@groovy.org>");
-MODULE_AUTHOR("Hans Verkuil <hverkuil@xs4all.nl>");
+MODULE_AUTHOR("Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
 static int debug = 0;
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c
index 7a1f89d8a..1eabefc7d 100644
--- a/linux/drivers/media/video/saa7127.c
+++ b/linux/drivers/media/video/saa7127.c
@@ -61,9 +61,7 @@ static int debug = 0;
 static int test_image = 0;
 
 MODULE_DESCRIPTION("Philips SAA7127/9 video encoder driver");
-MODULE_AUTHOR("Kevin Thayer <nufan_wfk@yahoo.com>");
-MODULE_AUTHOR("Chris Kennedy <c@groovy.org>");
-MODULE_AUTHOR("Hans Verkuil <hverkuil@xs4all.nl>");
+MODULE_AUTHOR("Kevin Thayer, Chris Kennedy, Hans Verkuil");
 MODULE_LICENSE("GPL");
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 module_param(debug, int, 0644);
diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c
index 4e60142ed..d24c09eec 100644
--- a/linux/drivers/media/video/wm8775.c
+++ b/linux/drivers/media/video/wm8775.c
@@ -5,6 +5,11 @@
  *
  * Based on saa7115 driver
  *
+ * Copyright (C) 2005 Hans Verkuil <hverkuil@xs4all.nl>
+ * - Cleanup
+ * - V4L2 API update
+ * - sound fixes
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -33,7 +38,7 @@
 #include <media/audiochip.h>
 
 MODULE_DESCRIPTION("wm8775 driver");
-MODULE_AUTHOR("Ulf Eklund");
+MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
 MODULE_LICENSE("GPL");
 
 #define wm8775_err(fmt, arg...) do { \
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index d2ab62d99..2bb493064 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-10 19:30  mchehab
+
+	* ../linux/drivers/media/video/cx25840/cx25840-core.c:
+	* ../linux/drivers/media/video/saa7115.c:
+	* ../linux/drivers/media/video/saa7127.c:
+	* ../linux/drivers/media/video/wm8775.c:
+
+	- Fixes MODULE_AUTHORSHIP.
+
+	Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
+	Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
 2005-11-10 17:00  mkrufky
 
 	* ../linux/drivers/media/video/em28xx/Kconfig: