diff options
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKBIG | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/DISKLESS | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/conf/GENERIC | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 9ad6653b0a1..d33806ca57b 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.115 2002/08/24 17:21:45 matthieu Exp $ +# $OpenBSD: GENERIC,v 1.116 2002/09/23 04:37:31 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ machine alpha @@ -174,7 +174,7 @@ sis* at pci? dev ? function ? # SiS 900/7016 ethernet en* at pci? dev ? function ? # ENI PCI ATM (untested) tl* at pci? dev ? function ? # Compaq Thunderlan ethernet le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI +#lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI wb* at pci? dev ? function ? # Winbond W89C840F ethernet sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet ste* at pci? dev ? function ? # Sundance ST201 ethernet diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index 8f6fff45a18..4eac6b5394c 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.33 2002/07/07 18:18:49 miod Exp $ +# $OpenBSD: RAMDISKBIG,v 1.34 2002/09/23 04:37:31 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -181,7 +181,7 @@ sis* at pci? dev ? function ? # SiS 900/7016 ethernet en* at pci? dev ? function ? # ENI PCI ATM (untested) tl* at pci? dev ? function ? # Compaq Thunderlan ethernet le* at pci? dev ? function ? # PCI LANCE Ethernet (untested) -lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI +#lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI wb* at pci? dev ? function ? # Winbond W89C840F ethernet sf* at pci? dev ? function ? # Adaptec AIC-6915 ethernet ste* at pci? dev ? function ? # Sundance ST201 ethernet diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS index 38e1415e2e9..9ae48d66290 100644 --- a/sys/arch/i386/conf/DISKLESS +++ b/sys/arch/i386/conf/DISKLESS @@ -1,4 +1,4 @@ -# $OpenBSD: DISKLESS,v 1.45 2002/07/06 19:14:20 nordin Exp $ +# $OpenBSD: DISKLESS,v 1.46 2002/09/23 04:37:33 deraadt Exp $ # $NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $ # # DISKLESS -- Generic machine setup for diskless boot. @@ -501,7 +501,7 @@ pseudo-device loop 2 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP -pseudo-device sppp # Sync PPP/HDLC +#pseudo-device sppp # Sync PPP/HDLC pseudo-device tun 2 # network tunneling over tty pseudo-device enc 1 # IPSEC needs the encapsulation interface pseudo-device gre 1 # GRE encapsulation interface diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 6fe1c45aea5..7a42eaf88b6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.317 2002/09/03 16:30:54 mickey Exp $ +# $OpenBSD: GENERIC,v 1.318 2002/09/23 04:37:33 deraadt Exp $ # $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $ # # GENERIC -- everything that's currently supported @@ -180,7 +180,7 @@ pccom* at puc? port ? # options CY_HW_RTS cy0 at isa? iomem 0xd4000 irq 12 # ISA cyclom serial card cy* at pci? # PCI cyclom serial card -cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards +#cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports lpt1 at isa? port 0x278 @@ -317,7 +317,7 @@ ex0 at isa? port 0x320 irq 5 # Intel EtherExpress PRO/10 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 +#lmc* at pci? dev ? function ? # Lan Media Corp SSI/T3/HSSI le* at pci? dev ? function ? # PCnet-PCI based ethernet le* at isapnp? de* at pci? dev ? function ? # DC21X4X-based ethernet diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index bb00665f2d0..07e5bc850f6 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.89 2002/07/06 19:14:20 nordin Exp $ +# $OpenBSD: GENERIC,v 1.90 2002/09/23 04:37:33 deraadt Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -81,7 +81,7 @@ pseudo-device loop 2 # network loopback pseudo-device bpfilter 8 # packet filter pseudo-device sl 2 # CSLIP pseudo-device ppp 2 # PPP -pseudo-device sppp 1 # Sync PPP/HDLC +#pseudo-device sppp 1 # Sync PPP/HDLC pseudo-device tun 2 # network tunneling over tty pseudo-device enc 1 # option IPSEC needs the encapsulation interface pseudo-device bridge 2 # network bridging support |