Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/sun/cgsix.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/sun/cgsix.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- src/sys/dev/sun/cgsix.c 2008/04/05 16:46:15 1.36 +++ src/sys/dev/sun/cgsix.c 2008/04/28 20:23:58 1.37 @@ -1,4 +1,4 @@ -/* $NetBSD: cgsix.c,v 1.36 2008/04/05 16:46:15 cegger Exp $ */ +/* $NetBSD: cgsix.c,v 1.37 2008/04/28 20:23:58 martin Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -15,13 +15,6 @@ * 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. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED @@ -85,7 +78,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.36 2008/04/05 16:46:15 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.37 2008/04/28 20:23:58 martin Exp $"); #include #include