diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-23 04:37:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-09-23 04:37:34 +0000 |
| commit | fc3f7ac53fdd251ee68c8bef6cb4ec19870fb7c3 (patch) | |
| tree | d4294087f0a3feb42b5c05b041ab08e92d97dff9 /sys/arch/i386 | |
| parent | 7db2418acec2750d6606f4371a3251a480f15eb9 (diff) | |
turn off sppp, lmc, and cz until various licenses on those components are
resolved. sorry -- i've been warning people for some time that i would
start to take this stance.
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/DISKLESS | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 |
2 files changed, 5 insertions, 5 deletions
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 |