diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-09 21:36:13 -0400 |
| commit | 7e392f8c29ee045c6a29d50193d2fb10712eceb0 (patch) | |
| tree | c84097fe644c50c82f087ab7fa2d75167b8c0e16 /drivers/media/dvb/frontends/cx22702.h | |
| parent | 7713fef06517d216f96ee7c8ad750e72bc08d38f (diff) | |
| parent | 93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/media/dvb/frontends/cx22702.h')
| -rw-r--r-- | drivers/media/dvb/frontends/cx22702.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h index 8af766a31552..b1e465c6c2ce 100644 --- a/drivers/media/dvb/frontends/cx22702.h +++ b/drivers/media/dvb/frontends/cx22702.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH | 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH |
| 8 | Holger Waechtler <holger@convergence.de> | 8 | Holger Waechtler <holger@convergence.de> |
| 9 | 9 | ||
| 10 | Copyright (C) 2004 Steven Toth <stoth@hauppauge.com> | 10 | Copyright (C) 2004 Steven Toth <stoth@linuxtv.org> |
| 11 | 11 | ||
| 12 | This program is free software; you can redistribute it and/or modify | 12 | This program is free software; you can redistribute it and/or modify |
| 13 | it under the terms of the GNU General Public License as published by | 13 | it under the terms of the GNU General Public License as published by |