aboutsummaryrefslogtreecommitdiff
path: root/sys/sparc64/include/bus_dma.h
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2011-03-12 14:33:32 +0000
committerMarius Strobl <marius@FreeBSD.org>2011-03-12 14:33:32 +0000
commit273fb3dc7cfc1bf67f7507ca256fd082a3b3f2c9 (patch)
tree07caa9c823676a86b78701b99241b7e3f4f720d9 /sys/sparc64/include/bus_dma.h
parent87c7a116648f848f96f6c2a5217f1e27717a724c (diff)
Sync licenses and the corresponding RCS IDs with NetBSD, mainly switching
the licenses of Matthew R. Green and the TNF to 2-clause. Obtained from: NetBSD
Notes
Notes: svn path=/head/; revision=219567
Diffstat (limited to 'sys/sparc64/include/bus_dma.h')
-rw-r--r--sys/sparc64/include/bus_dma.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/sparc64/include/bus_dma.h b/sys/sparc64/include/bus_dma.h
index e2b89a1263a5..9e069df9874e 100644
--- a/sys/sparc64/include/bus_dma.h
+++ b/sys/sparc64/include/bus_dma.h
@@ -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
@@ -65,7 +58,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * from: NetBSD: bus.h,v 1.28 2001/07/19 15:32:19 thorpej Exp
+ * from: NetBSD: bus.h,v 1.58 2008/04/28 20:23:36 martin Exp
* and
* from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
*