diff options
| author | gibbs <gibbs@FreeBSD.org> | 2000-02-03 16:54:11 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 2000-02-03 16:54:11 +0000 |
| commit | ce08b55da1676fff8b4190f6db4cb75b06912a7f (patch) | |
| tree | 3176e284512cb0c92b1484407a9f750174e4329d /sys/dev | |
| parent | 595b411966875fc0380bd26109481d8cdafae88e (diff) | |
| download | FreeBSD-src-ce08b55da1676fff8b4190f6db4cb75b06912a7f.zip FreeBSD-src-ce08b55da1676fff8b4190f6db4cb75b06912a7f.tar.gz | |
Update copyright license terms to match the reset of the aic7xxx dirver.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic7xxx/93cx6.h | 10 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx_93cx6.h | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sys/dev/aic7xxx/93cx6.h b/sys/dev/aic7xxx/93cx6.h index ee013c2..7875032 100644 --- a/sys/dev/aic7xxx/93cx6.h +++ b/sys/dev/aic7xxx/93cx6.h @@ -11,16 +11,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions, and the following disclaimer, - * without modification, immediately at the beginning of the file. + * without modification. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * - * Where this Software is combined with software released under the terms of - * the GNU Public License ("GPL") and the terms of the GPL would require the - * combined work to also be released under the terms of the GPL, the terms - * and conditions of this License will apply in addition to those of the - * GPL with the exception of any terms or conditions of this License that - * conflict with, or are expressly prohibited by, the GPL. + * Alternatively, this software may be distributed under the terms of the + * the GNU Public License ("GPL"). * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE diff --git a/sys/dev/aic7xxx/aic7xxx_93cx6.h b/sys/dev/aic7xxx/aic7xxx_93cx6.h index ee013c2..7875032 100644 --- a/sys/dev/aic7xxx/aic7xxx_93cx6.h +++ b/sys/dev/aic7xxx/aic7xxx_93cx6.h @@ -11,16 +11,12 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions, and the following disclaimer, - * without modification, immediately at the beginning of the file. + * without modification. * 2. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission. * - * Where this Software is combined with software released under the terms of - * the GNU Public License ("GPL") and the terms of the GPL would require the - * combined work to also be released under the terms of the GPL, the terms - * and conditions of this License will apply in addition to those of the - * GPL with the exception of any terms or conditions of this License that - * conflict with, or are expressly prohibited by, the GPL. + * Alternatively, this software may be distributed under the terms of the + * the GNU Public License ("GPL"). * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
