summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2003-10-05 17:48:49 +0000
committerbouyer <bouyer@NetBSD.org>2003-10-05 17:48:49 +0000
commit7b066791c84bc77a0e56cfdcbc7ff87ac41e87c5 (patch)
treedf62a82597d8487408ee5cdfb525c40ff4c64e75 /sys/dev
parent61b40c3946c0646f1a9e86849cc2ba233f63d209 (diff)
Remove references to University of California from my copyright notices.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata_wdc.c9
-rw-r--r--sys/dev/ata/atavar.h7
-rw-r--r--sys/dev/ata/wdvar.h7
-rw-r--r--sys/dev/microcode/siop/esiop.ss7
-rw-r--r--sys/dev/pci/pciide.c9
-rw-r--r--sys/dev/pci/pciide_acer_reg.h7
-rw-r--r--sys/dev/pci/pciide_apollo_reg.h7
-rw-r--r--sys/dev/pci/pciide_cmd_reg.h7
-rw-r--r--sys/dev/pci/pciide_cy693_reg.h7
-rw-r--r--sys/dev/pci/pciide_hpt_reg.h8
-rw-r--r--sys/dev/pci/pciide_pdc202xx_reg.h7
-rw-r--r--sys/dev/pci/pciide_piix_reg.h7
-rw-r--r--sys/dev/pci/pciide_sis_reg.h7
-rw-r--r--sys/dev/scsipi/atapi_wdc.c9
-rw-r--r--sys/dev/scsipi/st_atapi.c9
15 files changed, 50 insertions, 64 deletions
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 7910377e19b..bbc86c661d0 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_wdc.c,v 1.39 2003/04/28 05:20:29 nakayama Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.40 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -68,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.39 2003/04/28 05:20:29 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.40 2003/10/05 17:48:49 bouyer Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 3bc7fb68fa9..601c0933de2 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.27 2003/07/08 10:06:28 itojun Exp $ */
+/* $NetBSD: atavar.h,v 1.28 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index 103909b0eed..409a8ff5169 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdvar.h,v 1.17 2003/04/15 18:27:27 darrenr Exp $ */
+/* $NetBSD: wdvar.h,v 1.18 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/microcode/siop/esiop.ss b/sys/dev/microcode/siop/esiop.ss
index 753e5f67916..486b81a5abc 100644
--- a/sys/dev/microcode/siop/esiop.ss
+++ b/sys/dev/microcode/siop/esiop.ss
@@ -1,4 +1,4 @@
-; $NetBSD: esiop.ss,v 1.15 2003/08/06 11:39:58 bouyer Exp $
+; $NetBSD: esiop.ss,v 1.16 2003/10/05 17:48:49 bouyer Exp $
;
; Copyright (c) 2002 Manuel Bouyer.
@@ -14,9 +14,8 @@
; 3. All advertising materials mentioning features or use of this software
; must display the following acknowledgement:
; This product includes software developed by Manuel Bouyer.
-; 4. Neither the name of the University nor the names of its contributors
-; may be used to endorse or promote products derived from this software
-; without specific prior written permission.
+; 4. The name of the author may not 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
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 0846b72ce9f..2eebb86d937 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.206 2003/09/25 19:29:49 mycroft Exp $ */
+/* $NetBSD: pciide.c,v 1.207 2003/10/05 17:48:49 bouyer Exp $ */
/*
@@ -15,9 +15,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -76,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.206 2003/09/25 19:29:49 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.207 2003/10/05 17:48:49 bouyer Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
diff --git a/sys/dev/pci/pciide_acer_reg.h b/sys/dev/pci/pciide_acer_reg.h
index 10f95bca6c6..ac99a6ec2a3 100644
--- a/sys/dev/pci/pciide_acer_reg.h
+++ b/sys/dev/pci/pciide_acer_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_acer_reg.h,v 1.6 2002/04/23 20:41:17 bouyer Exp $ */
+/* $NetBSD: pciide_acer_reg.h,v 1.7 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h
index 957eab6dffa..9737e5f9060 100644
--- a/sys/dev/pci/pciide_apollo_reg.h
+++ b/sys/dev/pci/pciide_apollo_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_apollo_reg.h,v 1.12 2002/08/25 17:25:35 bouyer Exp $ */
+/* $NetBSD: pciide_apollo_reg.h,v 1.13 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h
index a85c8067d24..da465a1873f 100644
--- a/sys/dev/pci/pciide_cmd_reg.h
+++ b/sys/dev/pci/pciide_cmd_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_cmd_reg.h,v 1.12 2002/04/23 20:41:18 bouyer Exp $ */
+/* $NetBSD: pciide_cmd_reg.h,v 1.13 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h
index 88b8c7b2dae..6be3f8e4f6e 100644
--- a/sys/dev/pci/pciide_cy693_reg.h
+++ b/sys/dev/pci/pciide_cy693_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_cy693_reg.h,v 1.6 2002/04/23 20:41:18 bouyer Exp $ */
+/* $NetBSD: pciide_cy693_reg.h,v 1.7 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_hpt_reg.h b/sys/dev/pci/pciide_hpt_reg.h
index b5440aa69d3..ceaee18ffa4 100644
--- a/sys/dev/pci/pciide_hpt_reg.h
+++ b/sys/dev/pci/pciide_hpt_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_hpt_reg.h,v 1.9 2002/08/23 16:24:55 bouyer Exp $ */
+/* $NetBSD: pciide_hpt_reg.h,v 1.10 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -14,9 +14,9 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h
index 35ba4e7959a..b6523a01241 100644
--- a/sys/dev/pci/pciide_pdc202xx_reg.h
+++ b/sys/dev/pci/pciide_pdc202xx_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pdc202xx_reg.h,v 1.10 2003/06/28 23:13:27 bouyer Exp $ */
+/* $NetBSD: pciide_pdc202xx_reg.h,v 1.11 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_piix_reg.h b/sys/dev/pci/pciide_piix_reg.h
index f08844ac9cc..f42f1b7b74b 100644
--- a/sys/dev/pci/pciide_piix_reg.h
+++ b/sys/dev/pci/pciide_piix_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_piix_reg.h,v 1.7 2002/04/23 20:41:18 bouyer Exp $ */
+/* $NetBSD: pciide_piix_reg.h,v 1.8 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h
index bab79209f3a..52718f2e75f 100644
--- a/sys/dev/pci/pciide_sis_reg.h
+++ b/sys/dev/pci/pciide_sis_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_sis_reg.h,v 1.10 2003/03/14 22:46:06 bouyer Exp $ */
+/* $NetBSD: pciide_sis_reg.h,v 1.11 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sys/dev/scsipi/atapi_wdc.c b/sys/dev/scsipi/atapi_wdc.c
index eaed4932425..5e365be5a89 100644
--- a/sys/dev/scsipi/atapi_wdc.c
+++ b/sys/dev/scsipi/atapi_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.57 2003/09/19 21:36:09 mycroft Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.58 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.57 2003/09/19 21:36:09 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.58 2003/10/05 17:48:49 bouyer Exp $");
#ifndef WDCDEBUG
#define WDCDEBUG
diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c
index 48a08756aba..c8d6818bc82 100644
--- a/sys/dev/scsipi/st_atapi.c
+++ b/sys/dev/scsipi/st_atapi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.11 2002/10/02 16:52:56 thorpej Exp $ */
+/* $NetBSD: st_atapi.c,v 1.12 2003/10/05 17:48:49 bouyer Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -14,9 +14,8 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by Manuel Bouyer.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -32,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.11 2002/10/02 16:52:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.12 2003/10/05 17:48:49 bouyer Exp $");
#include "opt_scsi.h"
#include "rnd.h"