Module Name: src
Committed By: mbalmer
Date: Sat Dec 1 11:37:27 UTC 2012
Modified Files:
src/games/rogue: machdep.c
src/sys/arch/ibmnws/include: pnp.h
src/sys/arch/prep/include: pnp.h
src/sys/dev/pci/n8: n8_memory_bsd.c
Log Message:
Fix misspelling of acceptible (it's only acceptable with an 'a', not an 'i').
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/games/rogue/machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ibmnws/include/pnp.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/include/pnp.h
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/n8/n8_memory_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rogue/machdep.c
diff -u src/games/rogue/machdep.c:1.19 src/games/rogue/machdep.c:1.20
--- src/games/rogue/machdep.c:1.19 Thu Sep 1 07:18:51 2011
+++ src/games/rogue/machdep.c Sat Dec 1 11:37:27 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.19 2011/09/01 07:18:51 plunky Exp $ */
+/* $NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)machdep.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: machdep.c,v 1.19 2011/09/01 07:18:51 plunky Exp $");
+__RCSID("$NetBSD: machdep.c,v 1.20 2012/12/01 11:37:27 mbalmer Exp $");
#endif
#endif /* not lint */
@@ -84,7 +84,7 @@ __RCSID("$NetBSD: machdep.c,v 1.19 2011/
* #endif
* }
*
- * Appropriate variations of this are of course acceptible.
+ * Appropriate variations of this are of course acceptable.
* The use of "#elseif" is discouraged because of non-portability.
* If the correct #define doesn't exist, "UNIX_SYSV" in this case, make it up
* and insert it in the list at the top of the file. Alter the CFLAGS
Index: src/sys/arch/ibmnws/include/pnp.h
diff -u src/sys/arch/ibmnws/include/pnp.h:1.1 src/sys/arch/ibmnws/include/pnp.h:1.2
--- src/sys/arch/ibmnws/include/pnp.h:1.1 Sun Oct 19 03:33:50 2003
+++ src/sys/arch/ibmnws/include/pnp.h Sat Dec 1 11:37:26 2012
@@ -542,7 +542,7 @@ typedef union _PnP_TAG_PACKET {
unsigned char Tag; /* small tag = 0x30 or 0x31 */
unsigned char Priority; /* Optional; if missing then x01; else*/
/* x00 = best possible */
- /* x01 = acceptible */
+ /* x01 = acceptable */
/* x02 = sub-optimal but functional */
} S6_Pack;
Index: src/sys/arch/prep/include/pnp.h
diff -u src/sys/arch/prep/include/pnp.h:1.3 src/sys/arch/prep/include/pnp.h:1.4
--- src/sys/arch/prep/include/pnp.h:1.3 Thu Mar 9 20:17:27 2006
+++ src/sys/arch/prep/include/pnp.h Sat Dec 1 11:37:26 2012
@@ -567,7 +567,7 @@ typedef union _PnP_TAG_PACKET {
unsigned char Tag; /* small tag = 0x30 or 0x31 */
unsigned char Priority; /* Optional; if missing then x01; else*/
/* x00 = best possible */
- /* x01 = acceptible */
+ /* x01 = acceptable */
/* x02 = sub-optimal but functional */
} S6_Pack;
Index: src/sys/dev/pci/n8/n8_memory_bsd.c
diff -u src/sys/dev/pci/n8/n8_memory_bsd.c:1.5 src/sys/dev/pci/n8/n8_memory_bsd.c:1.6
--- src/sys/dev/pci/n8/n8_memory_bsd.c:1.5 Sat Oct 27 17:18:36 2012
+++ src/sys/dev/pci/n8/n8_memory_bsd.c Sat Dec 1 11:37:27 2012
@@ -61,7 +61,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.5 2012/10/27 17:18:36 chs Exp $";
+static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.6 2012/12/01 11:37:27 mbalmer Exp $";
/*****************************************************************************/
/** @file n8_memory_bsd.c
* @brief NetOctaveMemory Services - FreeBSD-specific support routines.
@@ -280,8 +280,8 @@ n8_GetLargeAllocation(N8_MemoryType_t ba
#if 0
/* Replacement for: */
m = contigmalloc(size, M_DEVBUF, M_WAITOK,
- 0, /* lower acceptible phys addr */
- 0xffffffff, /* upper acceptible phys addr */
+ 0, /* lower acceptable phys addr */
+ 0xffffffff, /* upper acceptable phys addr */
PAGE_SIZE, /* alignment */
0); /* boundary */
#endif
