summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1997-07-07 12:37:04 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1997-07-07 12:37:04 +0000
commit737aaa9bc893a743d32d14f6f7663d90769ac13a (patch)
tree23ec21b893f2af2e3c1b886ab7ff7f8fef7d425e
parent18b8d8141243661dd9c5dcd1e30bbaf10329362b (diff)
Adapt to current GENERIC
-rw-r--r--sys/arch/i386/conf/PETRA8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/i386/conf/PETRA b/sys/arch/i386/conf/PETRA
index be375f8350f..728781fe07f 100644
--- a/sys/arch/i386/conf/PETRA
+++ b/sys/arch/i386/conf/PETRA
@@ -1,4 +1,4 @@
-# $OpenBSD: PETRA,v 1.2 1997/05/29 00:19:37 niklas Exp $
+# $OpenBSD: PETRA,v 1.3 1997/07/07 12:37:03 niklas Exp $
#
# PETRA -- everything that's currently supported with certain
# changes for Applitron's fileserver petra, a 128 MB
@@ -18,8 +18,6 @@ option VM86 # Virtual 8086 emulation
option USER_LDT # user-settable LDT; used by WINE
#option XSERVER
-option IPSEC # IP-SEC encapsulation
-
# Some BIOSes don't get the size of extended memory right. If you
# have a broken BIOS, uncomment the following and set the value
# properly for your system.
@@ -161,6 +159,8 @@ ep* at eisa? slot ? # 3C579 ethernet cards
fea* at eisa? slot ? # DEC DEFEA FDDI cards
le* at pci? dev ? function ? # PCnet-PCI based ethernet cards
de* at pci? dev ? function ? # DC21X4X-based ethernet cards
+fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards
+ed* at pci? dev ? function ? # NE2000-compat ethernet cards
ep0 at pci? dev ? function ? # 3C590 ethernet cards
ep* at pci? dev ? function ? # 3C590 ethernet cards
ed* at pcmcia? port 0x300 size 0x20 irq 10 slot ? # PCMCIA based ed cards
@@ -178,5 +178,3 @@ gus0 at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis UltraSound (flags is record
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
-
-pseudo-device enc 4