diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/media/video/bttv-if.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/media/video/bttv-if.c')
| -rw-r--r-- | drivers/media/video/bttv-if.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c index e8aada772b89..19b564ab0e92 100644 --- a/drivers/media/video/bttv-if.c +++ b/drivers/media/video/bttv-if.c | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* | 1 | /* |
| 2 | 2 | ||
| 3 | bttv-if.c -- old gpio interface to other kernel modules | 3 | bttv-if.c -- old gpio interface to other kernel modules |
| 4 | don't use in new code, will go away in 2.7 | 4 | don't use in new code, will go away in 2.7 |
| 5 | have a look at bttv-gpio.c instead. | 5 | have a look at bttv-gpio.c instead. |
| 6 | 6 | ||
| 7 | bttv - Bt848 frame grabber driver | 7 | bttv - Bt848 frame grabber driver |
| 8 | 8 | ||
| 9 | Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de) | 9 | Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de) |
| 10 | & Marcus Metzler (mocm@thp.uni-koeln.de) | 10 | & Marcus Metzler (mocm@thp.uni-koeln.de) |
| 11 | (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org> | 11 | (c) 1999-2003 Gerd Knorr <kraxel@bytesex.org> |
| 12 | 12 | ||
| 13 | This program is free software; you can redistribute it and/or modify | 13 | This program is free software; you can redistribute it and/or modify |