summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2006-01-12 16:57:00 +0000
committerMichael Krufky <devnull@localhost>2006-01-12 16:57:00 +0000
commitb1d168376a16805da958799cdfd2db181434a7d6 (patch)
tree91787b4e1b8655c83575da61661c3e8bf9816c2e
parent153b99d30afb372746538aecfeb1ac768befc137 (diff)
downloadmediapointer-dvb-s2-b1d168376a16805da958799cdfd2db181434a7d6.tar.gz
mediapointer-dvb-s2-b1d168376a16805da958799cdfd2db181434a7d6.tar.bz2
Updated MODULE_AUTHOR
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/dvb/dvb-usb/cxusb.c6
-rw-r--r--v4l/ChangeLog8
2 files changed, 12 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/cxusb.c b/linux/drivers/media/dvb/dvb-usb/cxusb.c
index 397079aed..96e58dff0 100644
--- a/linux/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/linux/drivers/media/dvb/dvb-usb/cxusb.c
@@ -693,7 +693,11 @@ static void __exit cxusb_module_exit(void)
module_init (cxusb_module_init);
module_exit (cxusb_module_exit);
-MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
+#define DRIVER_AUTHOR "Patrick Boettcher <patrick.boettcher@desy.de>, " \
+ "Michael Krufky <mkrufky@m1k.net>, " \
+ "Chris Pascoe <c.pascoe@itee.uq.edu.au>"
+
+MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION("Driver for Conexant USB2.0 hybrid reference design");
MODULE_VERSION("1.0-alpha");
MODULE_LICENSE("GPL");
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a44459729..4473216eb 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-12 16:55 mkrufky
+
+ * linux/drivers/media/dvb/dvb-usb/cxusb.c:
+ - Updated MODULE_AUTHOR
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2006-01-12 16:13 mkrufky
* linux/drivers/media/video/cx88/Makefile:
@@ -108,7 +115,6 @@
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
->>>>>>> 1.865
2006-01-12 00:11 mchehab
* linux/drivers/media/video/cx25840/cx25840-core.c: (set_input),