Module Name: src
Committed By: snj
Date: Fri Oct 23 06:53:13 UTC 2009
Modified Files:
src/sys/arch/arm/at91: at91_bus_space.c at91aic.c at91aicreg.h
at91aicvar.h at91bus.c at91busvar.h at91dbgureg.h at91dbguvar.h
at91emac.c at91emacreg.h at91emacvar.h at91intr.h at91pdcreg.h
at91pmc.c at91pmcvar.h at91reg.h at91rm9200busvar.h at91rm9200reg.h
at91sam9261busvar.h at91sam9261reg.h at91streg.h at91tcreg.h
at91usart.c at91usartreg.h at91usartvar.h at91var.h
Log Message:
Drop 3rd and 4th clauses. Approved by all copyright holders:
joff and Embedtronics Oy's owners (Jukka Marin and Sami Kantoluoto).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/at91/at91_bus_space.c \
src/sys/arch/arm/at91/at91aic.c src/sys/arch/arm/at91/at91aicreg.h \
src/sys/arch/arm/at91/at91aicvar.h src/sys/arch/arm/at91/at91busvar.h \
src/sys/arch/arm/at91/at91dbgureg.h src/sys/arch/arm/at91/at91dbguvar.h \
src/sys/arch/arm/at91/at91emacreg.h src/sys/arch/arm/at91/at91emacvar.h \
src/sys/arch/arm/at91/at91intr.h src/sys/arch/arm/at91/at91pdcreg.h \
src/sys/arch/arm/at91/at91pmc.c src/sys/arch/arm/at91/at91pmcvar.h \
src/sys/arch/arm/at91/at91reg.h src/sys/arch/arm/at91/at91rm9200busvar.h \
src/sys/arch/arm/at91/at91rm9200reg.h \
src/sys/arch/arm/at91/at91sam9261busvar.h \
src/sys/arch/arm/at91/at91sam9261reg.h src/sys/arch/arm/at91/at91streg.h \
src/sys/arch/arm/at91/at91tcreg.h src/sys/arch/arm/at91/at91usart.c \
src/sys/arch/arm/at91/at91usartreg.h src/sys/arch/arm/at91/at91usartvar.h \
src/sys/arch/arm/at91/at91var.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/at91/at91bus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/at91/at91emac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/at91/at91_bus_space.c
diff -u src/sys/arch/arm/at91/at91_bus_space.c:1.2 src/sys/arch/arm/at91/at91_bus_space.c:1.3
--- src/sys/arch/arm/at91/at91_bus_space.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91_bus_space.c Fri Oct 23 06:53:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91_bus_space.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
/*
* Based on ep93xx_space.c
@@ -16,12 +16,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -37,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.2 2008/07/03 01:15:38 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91_bus_space.c,v 1.3 2009/10/23 06:53:12 snj Exp $");
/*
* bus_space I/O functions for ep93xx
Index: src/sys/arch/arm/at91/at91aic.c
diff -u src/sys/arch/arm/at91/at91aic.c:1.2 src/sys/arch/arm/at91/at91aic.c:1.3
--- src/sys/arch/arm/at91/at91aic.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91aic.c Fri Oct 23 06:53:12 2009
@@ -1,5 +1,5 @@
-/* $Id: at91aic.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91aic.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91aic.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
+/* $NetBSD: at91aic.c,v 1.3 2009/10/23 06:53:12 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -23,13 +23,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
Index: src/sys/arch/arm/at91/at91aicreg.h
diff -u src/sys/arch/arm/at91/at91aicreg.h:1.2 src/sys/arch/arm/at91/at91aicreg.h:1.3
--- src/sys/arch/arm/at91/at91aicreg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91aicreg.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91aicreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91aicreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91aicvar.h
diff -u src/sys/arch/arm/at91/at91aicvar.h:1.2 src/sys/arch/arm/at91/at91aicvar.h:1.3
--- src/sys/arch/arm/at91/at91aicvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91aicvar.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91aicvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91aicvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91busvar.h
diff -u src/sys/arch/arm/at91/at91busvar.h:1.2 src/sys/arch/arm/at91/at91busvar.h:1.3
--- src/sys/arch/arm/at91/at91busvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91busvar.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +13,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91dbgureg.h
diff -u src/sys/arch/arm/at91/at91dbgureg.h:1.2 src/sys/arch/arm/at91/at91dbgureg.h:1.3
--- src/sys/arch/arm/at91/at91dbgureg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91dbgureg.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbgureg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91dbgureg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91dbguvar.h
diff -u src/sys/arch/arm/at91/at91dbguvar.h:1.2 src/sys/arch/arm/at91/at91dbguvar.h:1.3
--- src/sys/arch/arm/at91/at91dbguvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91dbguvar.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91dbguvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91dbguvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -11,13 +11,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91emacreg.h
diff -u src/sys/arch/arm/at91/at91emacreg.h:1.2 src/sys/arch/arm/at91/at91emacreg.h:1.3
--- src/sys/arch/arm/at91/at91emacreg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91emacreg.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91emacreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91emacreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91emacreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emacreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved
@@ -12,13 +12,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91emacvar.h
diff -u src/sys/arch/arm/at91/at91emacvar.h:1.2 src/sys/arch/arm/at91/at91emacvar.h:1.3
--- src/sys/arch/arm/at91/at91emacvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91emacvar.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91emacvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91emacvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91emacvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emacvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved
@@ -17,13 +17,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91intr.h
diff -u src/sys/arch/arm/at91/at91intr.h:1.2 src/sys/arch/arm/at91/at91intr.h:1.3
--- src/sys/arch/arm/at91/at91intr.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91intr.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91intr.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91intr.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -17,13 +17,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 for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Index: src/sys/arch/arm/at91/at91pdcreg.h
diff -u src/sys/arch/arm/at91/at91pdcreg.h:1.2 src/sys/arch/arm/at91/at91pdcreg.h:1.3
--- src/sys/arch/arm/at91/at91pdcreg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pdcreg.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91pdcreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91pdcreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -12,12 +12,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91pmc.c
diff -u src/sys/arch/arm/at91/at91pmc.c:1.2 src/sys/arch/arm/at91/at91pmc.c:1.3
--- src/sys/arch/arm/at91/at91pmc.c:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pmc.c Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91pmc.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91pmc.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91pmc.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91pmc.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,13 +13,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
Index: src/sys/arch/arm/at91/at91pmcvar.h
diff -u src/sys/arch/arm/at91/at91pmcvar.h:1.2 src/sys/arch/arm/at91/at91pmcvar.h:1.3
--- src/sys/arch/arm/at91/at91pmcvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91pmcvar.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91pmcvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91pmcvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved.
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91reg.h
diff -u src/sys/arch/arm/at91/at91reg.h:1.2 src/sys/arch/arm/at91/at91reg.h:1.3
--- src/sys/arch/arm/at91/at91reg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91reg.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91reg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $NetBSD: at91reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -11,13 +11,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91rm9200busvar.h
diff -u src/sys/arch/arm/at91/at91rm9200busvar.h:1.2 src/sys/arch/arm/at91/at91rm9200busvar.h:1.3
--- src/sys/arch/arm/at91/at91rm9200busvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91rm9200busvar.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91rm9200busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91rm9200busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91rm9200busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91rm9200busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +13,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91rm9200reg.h
diff -u src/sys/arch/arm/at91/at91rm9200reg.h:1.2 src/sys/arch/arm/at91/at91rm9200reg.h:1.3
--- src/sys/arch/arm/at91/at91rm9200reg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91rm9200reg.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91rm9200reg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91rm9200reg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91rm9200reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91rm9200reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +13,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91sam9261busvar.h
diff -u src/sys/arch/arm/at91/at91sam9261busvar.h:1.2 src/sys/arch/arm/at91/at91sam9261busvar.h:1.3
--- src/sys/arch/arm/at91/at91sam9261busvar.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91sam9261busvar.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91sam9261busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91sam9261busvar.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91sam9261busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91sam9261busvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +13,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91sam9261reg.h
diff -u src/sys/arch/arm/at91/at91sam9261reg.h:1.2 src/sys/arch/arm/at91/at91sam9261reg.h:1.3
--- src/sys/arch/arm/at91/at91sam9261reg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91sam9261reg.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91sam9261reg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91sam9261reg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91sam9261reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91sam9261reg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -13,12 +13,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91streg.h
diff -u src/sys/arch/arm/at91/at91streg.h:1.2 src/sys/arch/arm/at91/at91streg.h:1.3
--- src/sys/arch/arm/at91/at91streg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91streg.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91streg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91streg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91streg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91streg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -12,13 +12,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91tcreg.h
diff -u src/sys/arch/arm/at91/at91tcreg.h:1.2 src/sys/arch/arm/at91/at91tcreg.h:1.3
--- src/sys/arch/arm/at91/at91tcreg.h:1.2 Thu Jul 3 01:15:38 2008
+++ src/sys/arch/arm/at91/at91tcreg.h Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91tcreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
-/* $NetBSD: at91tcreg.h,v 1.2 2008/07/03 01:15:38 matt Exp $ */
+/* $Id: at91tcreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91tcreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy
@@ -12,13 +12,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91usart.c
diff -u src/sys/arch/arm/at91/at91usart.c:1.2 src/sys/arch/arm/at91/at91usart.c:1.3
--- src/sys/arch/arm/at91/at91usart.c:1.2 Thu Jul 3 01:15:39 2008
+++ src/sys/arch/arm/at91/at91usart.c Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91usart.c,v 1.2 2008/07/03 01:15:39 matt Exp $ */
-/* $NetBSD: at91usart.c,v 1.2 2008/07/03 01:15:39 matt Exp $ */
+/* $Id: at91usart.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91usart.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -27,13 +27,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
@@ -84,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.2 2008/07/03 01:15:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91usart.c,v 1.3 2009/10/23 06:53:13 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/arm/at91/at91usartreg.h
diff -u src/sys/arch/arm/at91/at91usartreg.h:1.2 src/sys/arch/arm/at91/at91usartreg.h:1.3
--- src/sys/arch/arm/at91/at91usartreg.h:1.2 Thu Jul 3 01:15:39 2008
+++ src/sys/arch/arm/at91/at91usartreg.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91usartreg.h,v 1.2 2008/07/03 01:15:39 matt Exp $ */
+/* $NetBSD: at91usartreg.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91usartvar.h
diff -u src/sys/arch/arm/at91/at91usartvar.h:1.2 src/sys/arch/arm/at91/at91usartvar.h:1.3
--- src/sys/arch/arm/at91/at91usartvar.h:1.2 Thu Jul 3 01:15:39 2008
+++ src/sys/arch/arm/at91/at91usartvar.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91usartvar.h,v 1.2 2008/07/03 01:15:39 matt Exp $ */
+/* $NetBSD: at91usartvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -11,13 +11,7 @@
* 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 REGENTS 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
Index: src/sys/arch/arm/at91/at91var.h
diff -u src/sys/arch/arm/at91/at91var.h:1.2 src/sys/arch/arm/at91/at91var.h:1.3
--- src/sys/arch/arm/at91/at91var.h:1.2 Thu Jul 3 01:15:39 2008
+++ src/sys/arch/arm/at91/at91var.h Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91var.h,v 1.2 2008/07/03 01:15:39 matt Exp $ */
+/* $NetBSD: at91var.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
* All rights reserved.
@@ -11,12 +11,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 Ichiro FUKUHARA.
- * 4. The name of the company nor the name of the author may be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY ICHIRO FUKUHARA ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
Index: src/sys/arch/arm/at91/at91bus.c
diff -u src/sys/arch/arm/at91/at91bus.c:1.6 src/sys/arch/arm/at91/at91bus.c:1.7
--- src/sys/arch/arm/at91/at91bus.c:1.6 Tue Aug 11 17:04:14 2009
+++ src/sys/arch/arm/at91/at91bus.c Fri Oct 23 06:53:13 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: at91bus.c,v 1.6 2009/08/11 17:04:14 matt Exp $ */
+/* $NetBSD: at91bus.c,v 1.7 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -12,13 +12,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
@@ -34,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.6 2009/08/11 17:04:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.7 2009/10/23 06:53:13 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.5 src/sys/arch/arm/at91/at91emac.c:1.6
--- src/sys/arch/arm/at91/at91emac.c:1.5 Wed Mar 18 16:00:09 2009
+++ src/sys/arch/arm/at91/at91emac.c Fri Oct 23 06:53:13 2009
@@ -1,5 +1,5 @@
-/* $Id: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $ */
-/* $NetBSD: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $ */
+/* $Id: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -18,13 +18,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
@@ -40,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.5 2009/03/18 16:00:09 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.6 2009/10/23 06:53:13 snj Exp $");
#include <sys/types.h>
#include <sys/param.h>
