sync to 0622

4 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/hp300/conf/DUALITY b/sys/arch/hp300/conf/DUALITY
index 7cf20a396a5..ae12322cb3a 100644
--- a/sys/arch/hp300/conf/DUALITY
+++ b/sys/arch/hp300/conf/DUALITY
@@ -1,4 +1,4 @@
-#	$NetBSD: DUALITY,v 1.18 1995/05/12 12:49:54 mycroft Exp $
+#	$NetBSD: DUALITY,v 1.19 1996/05/20 18:16:42 mrg Exp $
 #
 # DUALITY (mycroft's hp370 test machine)
 #
@@ -45,12 +45,13 @@ options		FDESC
 options		FIFO
 options		KERNFS
 #options	NULLFS
-#options	PORTAL
+#options	PORTAL		# portal filesystem (still experimental)
 options		PROCFS
 #options	UMAPFS
 options		UNION
 
 # GNU uses setuid scripts
+options		SETUIDSCRIPTS
 
 options		GATEWAY
 options		INET
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index b0c61cc733d..47138c043a0 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -26,6 +26,7 @@ options         "COMPAT_43"             # compatibility with 4.3BSD interfaces
 options         "COMPAT_44"             # compatibility with 4.4BSD binaries
 options         "COMPAT_09"             # compatibility with NetBSD 0.9
 options		"COMPAT_10"		# compatibility with NetBSD 1.0
+options		"COMPAT_M68K4K"
 options         SYSVSHM                 # System V-style shared memory
 options         SYSVSEM                 # System V-style semaphores
 options         SYSVMSG                 # System V-style message queues
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 36cfc3ce640..4456e890319 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,5 +1,4 @@
-#	$OpenBSD: Makefile.hp300,v 1.6 1996/04/25 06:36:20 mickey Exp $
-#	$NetBSD: Makefile.hp300,v 1.38 1996/03/01 17:03:17 scottr Exp $
+#	$NetBSD: Makefile.hp300,v 1.39 1996/05/11 16:12:02 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -150,7 +149,7 @@ links:
 
 SRCS=	${HP300}/hp300/locore.s \
 	param.c ioconf.c ${CFILES} ${SFILES}
-depend: .depend
+depend:: .depend
 .depend: ${SRCS} assym.h param.c
 	mkdep ${AFLAGS} ${CPPFLAGS} ${HP300}/hp300/locore.s
 	mkdep -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
@@ -164,9 +163,7 @@ depend: .depend
 autoconf.o conf.o: Makefile
  
 # depend on network or filesystem configuration 
-uipc_domain.o uipc_proto.o vfs_conf.o: Makefile 
-if_tun.o if_loop.o if_ethersubr.o: Makefile
-in_proto.o: Makefile
+uipc_proto.o vfs_conf.o: Makefile 
 
 # depend on maxusers
 genassym.o machdep.o: Makefile
diff --git a/sys/arch/hp300/conf/files.hp300.oldconf b/sys/arch/hp300/conf/files.hp300.oldconf
index a393f505edd..e2d1f5f1a27 100644
--- a/sys/arch/hp300/conf/files.hp300.oldconf
+++ b/sys/arch/hp300/conf/files.hp300.oldconf
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hp300.oldconf,v 1.25 1996/02/24 00:54:55 thorpej Exp $
+#	$NetBSD: files.hp300.oldconf,v 1.26.4.1 1996/06/10 06:51:58 thorpej Exp $
 #
 arch/hp300/hp300/autoconf.c		standard
 arch/hp300/hp300/clock.c		standard
@@ -24,6 +24,7 @@ arch/hp300/dev/grf_rb.c			optional grf needs-count # XXX? d-d?
 arch/hp300/dev/grf_tc.c			optional grf needs-count # XXX? d-d?
 arch/hp300/dev/dcm.c			optional dcm device-driver
 arch/hp300/dev/if_le.c			optional le device-driver
+dev/ic/am7990.c				optional le device-driver
 arch/hp300/dev/dma.c			standard
 arch/hp300/dev/hpib.c			optional hpib
 arch/hp300/dev/fhpib.c			optional hpib device-driver
@@ -34,7 +35,7 @@ arch/hp300/dev/ppi.c			optional ppi device-driver
 arch/hp300/dev/rd.c			optional rd needs-count # XXX? d-d?
 arch/hp300/dev/rd_compat.c		optional rd compat_nolabel
 arch/hp300/dev/scsi.c			optional scsi device-driver
-arch/hp300/dev/ac.c			optional ac
+arch/hp300/dev/ac.c			optional ac needs-count # XXX? d-d?
 arch/hp300/dev/sd.c			optional sd needs-count # XXX? d-d?
 arch/hp300/dev/sd_compat.c		optional sd compat_nolabel
 arch/hp300/dev/st.c			optional st needs-count # XXX? d-d?