Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/hp300/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/hp300/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.55
retrieving revision 1.55.2.2
diff -u -p -r1.55 -r1.55.2.2
--- src/sys/arch/hp300/conf/GENERIC	2000/06/14 22:02:24	1.55
+++ src/sys/arch/hp300/conf/GENERIC	2000/08/11 20:18:03	1.55.2.2
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.55 2000/06/14 22:02:24 veego Exp $
+#	$NetBSD: GENERIC,v 1.55.2.2 2000/08/11 20:18:03 mason Exp $
 #
 # Generic kernel - one size fits all.
 #
@@ -6,7 +6,7 @@
 # Include attributes common to all hp300s
 include "arch/hp300/conf/std.hp300"
 
-#ident 		"GENERIC-$Revision: 1.55 $"
+#ident 		"GENERIC-$Revision: 1.55.2.2 $"
 
 # Support for various CPU types
 options 	HP320
@@ -55,7 +55,7 @@ file-system	MFS		# Memory-based filesyst
 # Filesystem options
 options 	QUOTA		# User and group quotas in FFS
 #options 	FFS_EI		# FFS Endian Independant support
-#options 	SOFTDEP         # FFS soft updates support.
+options 	SOFTDEP         # FFS soft updates support.
 options 	NFSSERVER	# Network filesystem server
 options 	NFS_BOOT_BOOTPARAM # use Sun bootparams for NFS boot
 
@@ -176,7 +176,7 @@ sd*		at oscsi? target ? lun ?	# SCSI dis
 st*		at oscsi? target ? lun ?	# SCSI tapes
 ac*		at oscsi? target ? lun ?	# SCSI changers
 
-pseudo-device	pty		64	# pseudo ptys
+pseudo-device	pty		64	# pseudo-terminals
 pseudo-device	sl		4	# SLIP network interfaces
 pseudo-device	ppp		4	# PPP network interfaces
 pseudo-device	bpfilter	16	# Berkeley packet filter