diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 7 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKB | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISKC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 5 |
5 files changed, 6 insertions, 17 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index d592e6e291f..c3e2df2cace 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.340 2003/05/20 20:28:34 grange Exp $ +# $OpenBSD: GENERIC,v 1.341 2003/05/31 23:58:43 miod Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -332,9 +332,8 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet -ep* at isapnp? # 3C509 PnP ethernet ep* at isa? port ? irq ? # 3C509 ethernet +ep* at isapnp? # 3C509 PnP ethernet ef* at isapnp? # 3C515 PnP ethernet ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 #ie1 at isa? port 0x300 irq 10 # EtherExpress @@ -345,7 +344,6 @@ ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 #tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring #tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring #tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring -ep0 at eisa? slot ? ep* at eisa? slot ? # 3C579 ethernet fea* at eisa? slot ? # DEC DEFEA FDDI lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI @@ -355,7 +353,6 @@ de* at pci? dev ? function ? # DC21X4X-based ethernet fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet ne* at pci? dev ? function ? # NE2000-compat ethernet -ep0 at pci? dev ? function ? # 3C59x ethernet ep* at pci? dev ? function ? # 3C59x ethernet ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet ep* at pcmcia? function ? # PCMCIA based 3C5xx ethernet diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK index 7783e04d30b..84f2e38fc7d 100644 --- a/sys/arch/i386/conf/RAMDISK +++ b/sys/arch/i386/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.118 2003/05/14 01:34:43 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.119 2003/05/31 23:58:43 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -192,14 +192,12 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet cards #eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet cards #el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards -ep0 at isa? port ? irq ? # 3C509 ethernet cards ep* at isa? port ? irq ? # 3C509 ethernet cards ef* at isapnp? # 3C515 PnP ethernet #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? slot ? 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 @@ -207,7 +205,6 @@ ep* at isapnp? # 3C509 PnP ethernet cards le* at isapnp? de* at pci? dev ? function ? # DC21X4X-based ethernet cards fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -ep0 at pci? dev ? function ? # 3C59x ethernet cards ep* at pci? dev ? function ? # 3C59x ethernet cards ne* at pci? dev ? function ? # NE2000-compat ethernet cards ne* at pcmcia? function ? # PCMCIA based NE2000 cards diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB index b4bb494bd67..365cd234d29 100644 --- a/sys/arch/i386/conf/RAMDISKB +++ b/sys/arch/i386/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.59 2003/05/14 01:34:43 deraadt Exp $ +# $OpenBSD: RAMDISKB,v 1.60 2003/05/31 23:58:43 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -228,7 +228,6 @@ scsibus* at atapiscsi? #le* at isapnp? de* at pci? dev ? function ? # DC21X4X-based ethernet cards fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet cards -ep0 at pci? dev ? function ? # 3C59x ethernet cards ep* at pci? dev ? function ? # 3C59x ethernet cards #ne* at pci? dev ? function ? # NE2000-compat ethernet cards #ne* at pcmcia? function ? # PCMCIA based NE2000 cards diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC index 71c85bcc135..785c2cbcbd1 100644 --- a/sys/arch/i386/conf/RAMDISKC +++ b/sys/arch/i386/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.31 2003/05/14 01:34:43 deraadt Exp $ +# $OpenBSD: RAMDISKC,v 1.32 2003/05/31 23:58:43 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -202,7 +202,6 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet #eg0 at isa? port 0x310 irq 5 # 3C505/Etherlink+ ethernet #el0 at isa? port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet ep* at isa? port ? irq ? # 3C509 ethernet ef* at isapnp? # 3C515 PnP ethernet #ie0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN and 3C507 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index 6638965b102..d58324bedcc 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.60 2002/09/24 19:08:14 nate Exp $ +# $OpenBSD: RAMDISK_CD,v 1.61 2003/05/31 23:58:43 miod Exp $ machine i386 # architecture, used by config; REQUIRED @@ -254,14 +254,12 @@ ne2 at isa? port 0x280 irq 9 # NE[12]000 ethernet ne* at isapnp? # NE[12]000 PnP ethernet eg0 at isa? disable port 0x310 irq 5 # 3C505/Etherlink+ ethernet el0 at isa? disable port 0x300 irq 9 # 3C501 ethernet -ep0 at isa? port ? irq ? # 3C509 ethernet ep* at isa? port ? irq ? # 3C509 ethernet ef* at isapnp? # 3C515 PnP ethernet 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? slot ? ep* at eisa? slot ? # 3C579 ethernet ef* at isapnp? # 3C515 ethernet #fea* at eisa? slot ? # DEC DEFEA FDDI @@ -271,7 +269,6 @@ le* at isapnp? de* at pci? dev ? function ? # DC21X4X-based ethernet fxp* at pci? dev ? function ? # EtherExpress 10/100B ethernet fxp* at cardbus? dev ? function ? # Intel PRO/100 ethernet -ep0 at pci? dev ? function ? # 3C59x ethernet ep* at pci? dev ? function ? # 3C59x ethernet ne* at pci? dev ? function ? # NE2000-compat ethernet ne* at pcmcia? function ? # PCMCIA based NE2000 ethernet |