summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-26 21:44:38 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-26 21:44:38 +0000
commite3ac39c912bcefd466df7dd4a9262264088807cf (patch)
treee368da64cfa905e8ffc4fe191815ed0427f5bf03 /sys
parented7cc9d0a46a4aceaf22335fd1f66fc0eccf68a3 (diff)
renable sppp and lmc, now free
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/alpha/conf/RAMDISKBIG4
-rw-r--r--sys/arch/i386/conf/DISKLESS4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/conf/GENERIC4
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index c2183ffb7d6..f745a267f4f 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.117 2002/09/24 19:08:14 nate Exp $
+# $OpenBSD: GENERIC,v 1.118 2002/09/26 21:44:37 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 604c39b0a11..6785b3046d9 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.35 2002/09/24 19:08:14 nate Exp $
+# $OpenBSD: RAMDISKBIG,v 1.36 2002/09/26 21:44:37 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 9ae48d66290..b7f0bd444c9 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $OpenBSD: DISKLESS,v 1.46 2002/09/23 04:37:33 deraadt Exp $
+# $OpenBSD: DISKLESS,v 1.47 2002/09/26 21:44:37 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 3fcb9befc55..3f867f52be0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.319 2002/09/24 19:08:14 nate Exp $
+# $OpenBSD: GENERIC,v 1.320 2002/09/26 21:44:37 deraadt Exp $
# $NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
#
# GENERIC -- everything that's currently supported
@@ -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 07e5bc850f6..f1898959859 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.90 2002/09/23 04:37:33 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.91 2002/09/26 21:44:37 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