From owner-svn-src-head@FreeBSD.ORG  Wed May 20 18:04:57 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4D3E2106566B;
	Wed, 20 May 2009 18:04:57 +0000 (UTC)
	(envelope-from joel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A9098FC15;
	Wed, 20 May 2009 18:04:57 +0000 (UTC)
	(envelope-from joel@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4KI4vMt039090;
	Wed, 20 May 2009 18:04:57 GMT (envelope-from joel@svn.freebsd.org)
Received: (from joel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4KI4vHm039089;
	Wed, 20 May 2009 18:04:57 GMT (envelope-from joel@svn.freebsd.org)
Message-Id: <200905201804.n4KI4vHm039089@svn.freebsd.org>
From: Joel Dahl <joel@FreeBSD.org>
Date: Wed, 20 May 2009 18:04:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192452 - head/sys/dev/sound/sbus
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2009 18:04:57 -0000

Author: joel (doc committer)
Date: Wed May 20 18:04:56 2009
New Revision: 192452
URL: http://svn.freebsd.org/changeset/base/192452

Log:
  Remove license clauses 3 and 4 as per rev. 1.12 of cs4231reg.h in NetBSD.

Modified:
  head/sys/dev/sound/sbus/cs4231.h

Modified: head/sys/dev/sound/sbus/cs4231.h
==============================================================================
--- head/sys/dev/sound/sbus/cs4231.h	Wed May 20 17:59:49 2009	(r192451)
+++ head/sys/dev/sound/sbus/cs4231.h	Wed May 20 18:04:56 2009	(r192452)
@@ -14,13 +14,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