diff options
author | gibbs <gibbs@FreeBSD.org> | 1997-06-27 19:38:56 +0000 |
---|---|---|
committer | gibbs <gibbs@FreeBSD.org> | 1997-06-27 19:38:56 +0000 |
commit | 7ebb73022cd781d8b3686ece97684d4d13d0bf73 (patch) | |
tree | 3520df5b44f8c12505137f83d8c6144327ccc685 /sys/dev/aic7xxx/aic7xxx.reg | |
parent | 8023e6ade65c4a8413c51356b0f530bb3ecab092 (diff) | |
download | FreeBSD-src-7ebb73022cd781d8b3686ece97684d4d13d0bf73.zip FreeBSD-src-7ebb73022cd781d8b3686ece97684d4d13d0bf73.tar.gz |
Modify my copyright notice to allow the sequencer to be used with GPLed
software (aka Linux).
Fix a few bugs in the sequencer assembler.
Make it easy to compiler the assembler with debugging turned on.
Diffstat (limited to 'sys/dev/aic7xxx/aic7xxx.reg')
-rw-r--r-- | sys/dev/aic7xxx/aic7xxx.reg | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.reg b/sys/dev/aic7xxx/aic7xxx.reg index 2bb3184..fabef19 100644 --- a/sys/dev/aic7xxx/aic7xxx.reg +++ b/sys/dev/aic7xxx/aic7xxx.reg @@ -1,21 +1,28 @@ /* * Aic7xxx register and scratch ram definitions. * - * Copyright (c) 1994, 1995, 1996, 1997 Justin T. Gibbs. + * Copyright (c) 1994-1997 Justin Gibbs. * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice immediately at the beginning of the file, without modification, - * this list of conditions, and the following disclaimer. + * notice, this list of conditions, and the following disclaimer, + * without modification, immediately at the beginning of the file. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. 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. + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -28,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.reg,v 1.2 1997/04/14 02:26:56 gibbs Exp $ + * $Id: aic7xxx.reg,v 1.3 1997/04/24 16:52:16 gibbs Exp $ */ /* |