summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx23885/cx23885-video.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-31 08:23:58 +0200
commit83027ea1202394a80ca58ed8da84e207d855521e (patch)
treee785ac503165d57d3a5cfb88f20eff034d12199f /linux/drivers/media/video/cx23885/cx23885-video.c
parentf1a52a2e70204db19b6c81bb59de2c759cefaaa6 (diff)
parent7804585be37d9aa982df2d476a795cbe459dae4a (diff)
downloadmediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.gz
mediapointer-dvb-s2-83027ea1202394a80ca58ed8da84e207d855521e.tar.bz2
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-video.c')
-rw-r--r--linux/drivers/media/video/cx23885/cx23885-video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c
index 98a7dc1c0..fd82844bf 100644
--- a/linux/drivers/media/video/cx23885/cx23885-video.c
+++ b/linux/drivers/media/video/cx23885/cx23885-video.c
@@ -1,7 +1,7 @@
/*
* Driver for the Conexant CX23885 PCIe bridge
*
- * Copyright (c) 2007 Steven Toth <stoth@hauppauge.com>
+ * Copyright (c) 2007 Steven Toth <stoth@linuxtv.org>
*
* 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
@@ -42,7 +42,7 @@
#endif
MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
-MODULE_AUTHOR("Steven Toth <stoth@hauppauge.com>");
+MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
MODULE_LICENSE("GPL");
/* ------------------------------------------------------------------ */