diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC index c4bf34d5310f..4c5204a78f2f 100644 --- a/sys/arch/hp700/conf/GENERIC +++ b/sys/arch/hp700/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.20 2004/02/20 20:18:37 jkunz Exp $ +# $NetBSD: GENERIC,v 1.21 2004/03/12 11:44:13 jkunz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/hp700/conf/std.hp700" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.20 $" +#ident "GENERIC-$Revision: 1.21 $" maxusers 32 # estimated number of users @@ -395,7 +395,8 @@ ld* at mlx? unit ? # GSC network interfaces #medusa* at gsc? # FDDI -ie* at gsc? # 82C5[89]6 ether +#ie* at gsc? # old 82C5[89]6 Ethernet, use iee(4) +iee* at gsc? # 82C596 Ethernet # EISA network interfaces ep* at eisa? slot ? # 3Com 3c579 Ethernet diff --git a/sys/arch/hp700/conf/SMALL b/sys/arch/hp700/conf/SMALL index 70da07147797..65e99269b343 100644 --- a/sys/arch/hp700/conf/SMALL +++ b/sys/arch/hp700/conf/SMALL @@ -1,4 +1,4 @@ -# $NetBSD: SMALL,v 1.1 2003/11/18 04:03:32 chs Exp $ +# $NetBSD: SMALL,v 1.2 2004/03/12 11:44:13 jkunz Exp $ # # stripped-down GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/hp700/conf/std.hp700" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1 $" +#ident "GENERIC-$Revision: 1.2 $" maxusers 32 # estimated number of users @@ -208,7 +208,8 @@ uk* at scsibus? target ? lun ? # SCSI unknown # GSC network interfaces #medusa* at gsc? # FDDI -ie* at gsc? # 82C5[89]6 ether +#ie* at gsc? # old 82C5[89]6 Ethernet, use iee(4) +iee* at gsc? # 82C596 Ethernet # Audio Devices diff --git a/sys/arch/hp700/hp700/autoconf.c b/sys/arch/hp700/hp700/autoconf.c index b522ea2f2c91..6810dd3dbd79 100644 --- a/sys/arch/hp700/hp700/autoconf.c +++ b/sys/arch/hp700/hp700/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.12 2003/11/24 02:51:35 chs Exp $ */ +/* $NetBSD: autoconf.c,v 1.13 2004/03/12 11:44:13 jkunz Exp $ */ /* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */ @@ -86,7 +86,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.12 2003/11/24 02:51:35 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2004/03/12 11:44:13 jkunz Exp $"); #include "opt_kgdb.h" #include "opt_useleds.h" @@ -321,6 +321,7 @@ struct prom_n2f { }; static struct prom_n2f prom_dev_table[] = { { "ie", net_find }, + { "iee", net_find }, { "sd", scsi_find }, { "st", scsi_find }, { "cd", scsi_find }, @@ -344,7 +345,7 @@ cpu_rootconf(void) /* Get the PROM boot path and take it apart. */ /* XXX fredette - need something real here: */ - strcpy(promname, "ie"); + strcpy(promname, "iee"); prom_ctlr = prom_unit = prom_part = 0; /* Default to "unknown" */