summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-13 19:21:26 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-13 19:21:26 +0000
commit6a4fdc76ba022f2a950ee476047fcbb890da21da (patch)
tree64a5173af20826e956db07ace1a4c49c44a598ba /sys/arch
parent9c097b1236e9b0bf8595ec4d48fff61c576a3739 (diff)
em fits
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sparc64/conf/GENERIC3
-rw-r--r--sys/arch/sparc64/conf/RAMDISK3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 37de5320737..7c11d49f604 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.82 2003/05/14 23:32:35 miod Exp $
+# $OpenBSD: GENERIC,v 1.83 2003/06/13 19:21:25 deraadt Exp $
# $NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
machine sparc64
@@ -40,6 +40,7 @@ gem* at pci? dev ? function ?
fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet
xl* at pci? dev ? function ? # 3C9xx ethernet
dc* at pci? dev ? function ? # 21143, "tulip" clone ethernet
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
# PCI SCSI
siop* at pci? dev ? function ?
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 418a3e84a87..02c5625dcdc 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.23 2003/05/14 23:32:35 miod Exp $
+# $OpenBSD: RAMDISK,v 1.24 2003/06/13 19:21:25 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -45,6 +45,7 @@ hme* at pci? dev ? function ?
gem* at pci? dev ? function ?
#ti* at pci? dev ? function ?
dc* at pci? dev ? function ?
+em* at pci? dev ? function ? # Intel Pro/1000 ethernet
auxio* at ebus?
auxio* at sbus?