summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/notes/amd64/hardware4
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/amd64/conf/RAMDISK5
3 files changed, 7 insertions, 7 deletions
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index c2261a1e73d..4de1986f7a9 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.45 2005/04/29 01:11:47 jsg Exp $
+dnl $OpenBSD: hardware,v 1.46 2005/05/15 17:04:00 martin Exp $
OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
compatible designs.
@@ -207,6 +207,8 @@ dnl YENTA-compatible PCI-CardBus bridges
SUNIX 408x (2 port serial and 2 port parallel)
SUNIX 409x (4 port serial and 2 port parallel)
Ethernet Adapters
+ 3Com 3c509, 3c579, and 3c59x (disabling PnP on 3c509B is
+ recommended)
3Com 3c9xx Etherlink XL adapters, including:
3Com 3c900/3c900B PCI adapters
3Com 3c905/3c905B/3c905C PCI adapters
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index af4641fcfd0..866f76a7d32 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.65 2005/05/13 03:41:18 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.66 2005/05/15 17:04:00 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -249,8 +249,7 @@ scsibus* at atapiscsi?
fxp* at pci? # EtherExpress 10/100B ethernet
#fxp* at cardbus? # Intel PRO/100 ethernet
#ne* at pci? # NE2000-compat ethernet
-#ep0 at pci? # 3C59x ethernet
-#ep* at pci? # 3C59x ethernet
+ep* at pci? # 3C59x ethernet
#ne* at pcmcia? # PCMCIA based NE2000 ethernet
#ep* at pcmcia? # PCMCIA based 3C5xx ethernet
#sm* at pcmcia? # PCMCIA based sm ethernet
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 433d3f174ce..7277fb21796 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.20 2005/05/10 01:16:31 brad Exp $
+# $OpenBSD: RAMDISK,v 1.21 2005/05/15 17:04:00 martin Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -188,8 +188,7 @@ scsibus* at atapiscsi?
#de* at pci? # DC21X4X-based ethernet
fxp* at pci? # EtherExpress 10/100B ethernet
#fxp* at cardbus? # Intel PRO/100 ethernet
-#ep0 at pci? # 3C59x ethernet
-#ep* at pci? # 3C59x ethernet
+ep* at pci? # 3C59x ethernet
#ne* at pci? # NE2000-compat ethernet
#ne* at pcmcia? # PCMCIA based NE2000 ethernet
#ep* at pcmcia? # PCMCIA based 3C5xx ethernet