diff options
author | Jonathan Corbet <corbet@lwn.net> | 2007-03-22 18:44:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 14:45:06 -0400 |
commit | 77d5140fe78ca628bfc9d2567c35457481f9c63d (patch) | |
tree | 45697d47e1a2a89fb97a190607b7390220a47075 | |
parent | 7f7b12f09be8e396d159800baeaf922df46e25cf (diff) |
V4L/DVB (5469a): Copyright and maintainer tweaks
Fix up Cafe/ov7670 copyrights and maintainer entries
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | MAINTAINERS | 12 | ||||
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 1 | ||||
-rw-r--r-- | drivers/media/video/ov7670.c | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 456a3dbcc447..8a2f2fd5403e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -873,6 +873,12 @@ W: http://linuxtv.org | |||
873 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git | 873 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
874 | S: Maintained | 874 | S: Maintained |
875 | 875 | ||
876 | CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER | ||
877 | P: Jonathan Corbet | ||
878 | M: corbet@lwn.net | ||
879 | L: video4linux-list@redhat.com | ||
880 | S: Maintained | ||
881 | |||
876 | CALGARY x86-64 IOMMU | 882 | CALGARY x86-64 IOMMU |
877 | P: Muli Ben-Yehuda | 883 | P: Muli Ben-Yehuda |
878 | M: muli@il.ibm.com | 884 | M: muli@il.ibm.com |
@@ -2526,6 +2532,12 @@ P: Harald Welte | |||
2526 | M: laforge@gnumonks.org | 2532 | M: laforge@gnumonks.org |
2527 | S: Maintained | 2533 | S: Maintained |
2528 | 2534 | ||
2535 | OMNIVISION OV7670 SENSOR DRIVER | ||
2536 | P: Jonathan Corbet | ||
2537 | M: corbet@lwn.net | ||
2538 | L: video4linux-list@redhat.com | ||
2539 | S: Maintained | ||
2540 | |||
2529 | ONSTREAM SCSI TAPE DRIVER | 2541 | ONSTREAM SCSI TAPE DRIVER |
2530 | P: Willem Riede | 2542 | P: Willem Riede |
2531 | M: osst@riede.org | 2543 | M: osst@riede.org |
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 4aa360b89ada..59fd760a52ac 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -4,6 +4,7 @@ | |||
4 | * sensor. | 4 | * sensor. |
5 | * | 5 | * |
6 | * Copyright 2006 One Laptop Per Child Association, Inc. | 6 | * Copyright 2006 One Laptop Per Child Association, Inc. |
7 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> | ||
7 | * | 8 | * |
8 | * Written by Jonathan Corbet, corbet@lwn.net. | 9 | * Written by Jonathan Corbet, corbet@lwn.net. |
9 | * | 10 | * |
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 1e3c87a08430..639fc2367832 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c | |||
@@ -5,6 +5,8 @@ | |||
5 | * by Jonathan Corbet with substantial inspiration from Mark | 5 | * by Jonathan Corbet with substantial inspiration from Mark |
6 | * McClelland's ovcamchip code. | 6 | * McClelland's ovcamchip code. |
7 | * | 7 | * |
8 | * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> | ||
9 | * | ||
8 | * This file may be distributed under the terms of the GNU General | 10 | * This file may be distributed under the terms of the GNU General |
9 | * Public License, version 2. | 11 | * Public License, version 2. |
10 | */ | 12 | */ |