summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-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 4435a658545..8a0ee7f4a61 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.706 2011/01/06 07:28:45 damien Exp $
+# $OpenBSD: GENERIC,v 1.707 2011/01/07 19:33:08 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -573,7 +573,6 @@ sm0 at isa? port 0x300 irq 10 # SMC 91cxx-based ethernet
#tr0 at isa? port 0xa20 iomem 0xd8000 # IBM TROPIC based Token-Ring
#tr1 at isa? port 0xa24 iomem 0xd0000 # IBM TROPIC based Token-Ring
#tr* at isa? # 3COM TROPIC based Token-Ring
-ep0 at eisa?
ep* at eisa? # 3C579 ethernet
fea* at eisa? # DEC DEFEA FDDI
lmc* at pci? # Lan Media Corp SSI/T3/HSSI
@@ -584,7 +583,6 @@ de* at pci? # DC21X4X-based ethernet
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
ne* at pcmcia? # PCMCIA based NE2000 ethernet
ep* at pcmcia? # PCMCIA based 3C5xx ethernet
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 08a25947aa6..9ec129eb10e 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.172 2010/10/19 20:23:53 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.173 2011/01/07 19:33:08 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -212,14 +212,12 @@ ep* at isa? # 3C509 ethernet cards
#ie1 at isa? port 0x300 irq 10 # EtherExpress
le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
-#ep0 at eisa?
#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
fxp* at pci? # EtherExpress 10/100B ethernet cards
-ep0 at pci? # 3C59x ethernet cards
ep* at pci? # 3C59x ethernet cards
ne* at pci? # NE2000-compat ethernet cards
ne* at pcmcia? # PCMCIA based NE2000 cards
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 34d88e36a26..97b164de6cd 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKB,v 1.116 2010/10/19 20:23:53 deraadt Exp $
+# $OpenBSD: RAMDISKB,v 1.117 2011/01/07 19:33:08 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -237,14 +237,12 @@ scsibus* at atapiscsi?
#ie1 at isa? port 0x300 irq 10 # EtherExpress
#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
-#ep0 at eisa?
#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
fxp* at pci? # EtherExpress 10/100B ethernet cards
-ep0 at pci? # 3C59x ethernet cards
ep* at pci? # 3C59x ethernet cards
#ne* at pci? # NE2000-compat ethernet cards
#ne* at pcmcia? # PCMCIA based NE2000 cards
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index e48681567f5..fcfcc87e1cc 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKC,v 1.96 2010/10/19 20:23:53 deraadt Exp $
+# $OpenBSD: RAMDISKC,v 1.97 2011/01/07 19:33:08 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -248,7 +248,6 @@ scsibus* at atapiscsi?
#ie1 at isa? port 0x300 irq 10 # EtherExpress
#le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
#ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
-#ep0 at eisa?
#ep* at eisa? # 3C579 ethernet
#fea* at eisa? # DEC DEFEA FDDI
#ep* at isapnp? # 3C509 PnP ethernet
@@ -256,7 +255,6 @@ 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
#ne* at pci? # NE2000-compat ethernet
#ne* at pcmcia? # PCMCIA based NE2000
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 12264c2ba50..9857c907ec1 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.181 2010/10/19 20:23:53 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.182 2011/01/07 19:33:08 deraadt Exp $
machine i386 # architecture, used by config; REQUIRED
@@ -317,7 +317,6 @@ ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507
#ie1 at isa? port 0x300 irq 10 # EtherExpress
le0 at isa? port 0x360 irq 15 drq 6 # IsoLan, NE2100, and DEPCA
ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10
-ep0 at eisa?
ep* at eisa? # 3C579 ethernet
ef* at isapnp? # 3C515 ethernet
#fea* at eisa? # DEC DEFEA FDDI
@@ -326,7 +325,6 @@ pcn* at pci? # AMD PCnet-PCI Ethernet
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
ne* at pci? # NE2000-compat ethernet
ne* at pcmcia? # PCMCIA based NE2000 ethernet