summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/conf')
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/RAMDISK4
-rw-r--r--sys/arch/i386/conf/RAMDISKB4
-rw-r--r--sys/arch/i386/conf/RAMDISKC4
-rw-r--r--sys/arch/i386/conf/RAMDISK_CD4
5 files changed, 5 insertions, 15 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 07e4e3a1f12..29a848477ea 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.757 2013/10/21 05:52:15 dlg Exp $
+# $OpenBSD: GENERIC,v 1.758 2013/10/28 12:33:32 mpi Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -524,7 +524,6 @@ le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
sm0 at isa? port 0x300 irq 10 # SMC 91cxx-based ethernet
ep* at eisa? # 3C579 ethernet
-fea* at eisa? # DEC DEFEA FDDI
lmc* at pci? # Lan Media Corp SSI/T3/HSSI
san* at pci? # Sangoma PCI AFT card
le* at isapnp?
@@ -538,7 +537,6 @@ ne* at pcmcia? # PCMCIA based NE2000 ethernet
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? # PCMCIA based sm ethernet
xe* at pcmcia? # Xircom ethernet
-fpa* at pci? # DEC DEFPA FDDI
xl* at pci? # 3C9xx ethernet
xl* at cardbus? # 3C575/3C656 ethernet
rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 8bce1d4eb32..d87c8ced2a7 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.182 2013/10/05 17:05:15 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.183 2013/10/28 12:33:32 mpi Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -196,7 +196,6 @@ ep* at isa? # 3C509 ethernet cards
le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
#ep* at eisa? # 3C579 ethernet cards
-#fea* at eisa? # DEC DEFEA FDDI cards
ep* at isapnp? # 3C509 PnP ethernet cards
le* at isapnp?
de* at pci? # DC21X4X-based ethernet cards
@@ -207,7 +206,6 @@ ne* at pcmcia? # PCMCIA based NE2000 cards
ep* at pcmcia? # PCMCIA based 3c5xx cards
#sm* at pcmcia? # PCMCIA based sm cards
#xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI cards
xl* at pci? # 3C9xx ethernet cards
rl* at pci? # RealTek 81[23]9 ethernet
#epic* at pci? # SMC EPIC/100 ethernet
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 4c9c2508b95..32858956200 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.125 2013/10/18 21:57:55 miod Exp $
+# $OpenBSD: RAMDISKB,v 1.126 2013/10/28 12:33:32 mpi Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -209,7 +209,6 @@ atapiscsi* at pciide?
#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
#ep* at eisa? # 3C579 ethernet cards
-#fea* at eisa? # DEC DEFEA FDDI cards
#ep* at isapnp? # 3C509 PnP ethernet cards
#le* at isapnp?
de* at pci? # DC21X4X-based ethernet cards
@@ -220,7 +219,6 @@ ep* at pci? # 3C59x ethernet cards
#ep* at pcmcia? # PCMCIA based 3c5xx cards
#sm* at pcmcia? # PCMCIA based sm cards
#xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI cards
#xl* at pci? # 3C9xx ethernet cards
#rl* at pci? # RealTek 81[23]9 ethernet
#epic* at pci? # SMC EPIC/100 ethernet
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 9e4e7c5ce13..87e970d848f 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.106 2013/10/18 21:57:55 miod Exp $
+# $OpenBSD: RAMDISKC,v 1.107 2013/10/28 12:33:32 mpi Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -230,7 +230,6 @@ atapiscsi* at pciide?
#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
#ep* at eisa? # 3C579 ethernet
-#fea* at eisa? # DEC DEFEA FDDI
#ep* at isapnp? # 3C509 PnP ethernet
#le* at isapnp?
#de* at pci? # DC21X4X-based ethernet
@@ -242,7 +241,6 @@ atapiscsi* at pciide?
#ep* at pcmcia? # PCMCIA based 3C5xx
#sm* at pcmcia? # PCMCIA based sm
#xe* at pcmcia? # Xircom ethernet
-#fpa* at pci? # DEC DEFPA FDDI
#xl* at pci? # 3C9xx ethernet
#xl* at cardbus? # 3C575 ethernet
#rl* at pci? # RealTek 81[23]9 ethernet
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 29b73da41fc..1af8c6e6626 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.203 2013/10/21 05:52:15 dlg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.204 2013/10/28 12:33:32 mpi Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -285,7 +285,6 @@ le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
ep* at eisa? # 3C579 ethernet
ef* at isapnp? # 3C515 ethernet
-#fea* at eisa? # DEC DEFEA FDDI
le* at isapnp?
pcn* at pci? # AMD PCnet-PCI Ethernet
de* at pci? # DC21X4X-based ethernet
@@ -297,7 +296,6 @@ ne* at pcmcia? # PCMCIA based NE2000 ethernet
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
sm* at pcmcia? # PCMCIA based sm ethernet
xe* at pcmcia? # Xircom ethernet
-fpa* at pci? # DEC DEFPA FDDI
xl* at pci? # 3C9xx ethernet
xl* at cardbus? # 3C575 ethernet
rl* at pci? # RealTek 81[23]9 ethernet