summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-08-17 19:24:56 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-08-17 19:24:56 +0000
commit0418f2c50d5aee8701243fc4b680f98d992a460a (patch)
treedd4d81d8e7b1975510c5e266a912039b486d512f /sys
parent3f728385127ce8b6660566d0475ed62fdfde7bbd (diff)
enable msk(4) in a few more places.
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/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
-rw-r--r--sys/arch/macppc/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/RAMDISK4
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
8 files changed, 24 insertions, 8 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 78345c7ed2b..a15397ecc14 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.178 2006/08/14 08:34:21 jsg Exp $
+# $OpenBSD: GENERIC,v 1.179 2006/08/17 19:24:54 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -225,6 +225,8 @@ mtd* at pci? # Myson MTD800/803/891
epic* at pci? # SMC EPIC/100 ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
tl* at pci? # Compaq Thunderlan ethernet
ste* at pci? # Sundance ST201 ethernet
ral* at pci? # Ralink RT2500/RT2501/RT2600
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index 5a1f8427bdd..c4b8624b6a0 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKBIG,v 1.67 2006/06/01 23:11:38 brad Exp $
+# $OpenBSD: RAMDISKBIG,v 1.68 2006/08/17 19:24:54 brad 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.
@@ -197,6 +197,8 @@ mtd* at pci? # Myson MTD800/803/891
epic* at pci? # SMC EPIC/100 ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
tl* at pci? # Compaq Thunderlan ethernet
ste* at pci? # Sundance ST201 ethernet
ral* at pci? # Ralink RT2500/RT2501/RT2600
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 1caac9c52db..46a35df1d38 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.151 2006/08/14 16:22:39 marco Exp $
+# $OpenBSD: GENERIC,v 1.152 2006/08/17 19:24:54 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -339,6 +339,8 @@ dc* at cardbus? # 21143, "tulip" clone ethernet
ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
txp* at pci? # 3com 3CR990
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index a305fc3296c..f114b7ab4c3 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.60 2006/08/14 17:05:15 brad Exp $
+# $OpenBSD: RAMDISK_CD,v 1.61 2006/08/17 19:24:54 brad Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -232,6 +232,8 @@ sis* at pci? # SiS 900/7016 ethernet
#ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
#txp* at pci? # 3com 3CR990
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 1b1185f21e8..da32ef417e6 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.148 2006/08/14 08:34:21 jsg Exp $g
+# $OpenBSD: GENERIC,v 1.149 2006/08/17 19:24:55 brad Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -82,6 +82,8 @@ re* at pci? # Realtek 8169/8169S/8110S
stge* at pci? # Sundance TC9021 GigE
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
an* at pci? # Cisco/Aironet
atw* at pci? # ADMtek ADM8211 (802.11)
wi* at pci? # WaveLAN IEEE 802.11DS
diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK
index a17a4603922..95b18b13705 100644
--- a/sys/arch/macppc/conf/RAMDISK
+++ b/sys/arch/macppc/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.69 2006/06/26 22:16:23 miod Exp $
+# $OpenBSD: RAMDISK,v 1.70 2006/08/17 19:24:55 brad Exp $
#
# PPC GENERIC config file
#
@@ -79,6 +79,8 @@ rl* at pci? # Realtek 81[23]9 ethernet
stge* at pci? # Sundance TC9021 GigE
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
an* at pci? # Cisco/Aironet 802.11DS
wi* at pci? # WaveLAN IEEE 802.11DS
vr* at pci? # VIA Rhine ethernet
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index d6b1e024c0e..575e89e66bc 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.155 2006/08/14 08:34:21 jsg Exp $
+# $OpenBSD: GENERIC,v 1.156 2006/08/17 19:24:55 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -49,6 +49,8 @@ gem* at pci?
ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
fxp* at pci? # EtherExpress 10/100B ethernet
xl* at pci? # 3C9xx ethernet
pcn* at pci? # AMD PCnet-PCI Ethernet
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 30ba9b0046b..89beb4891a5 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.53 2006/06/26 22:16:23 miod Exp $
+# $OpenBSD: RAMDISK,v 1.54 2006/08/17 19:24:55 brad Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -53,6 +53,8 @@ gem* at pci?
ti* at pci? # Alteon Tigon 1Gb ethernet
skc* at pci? # SysKonnect GEnesis 984x
sk* at skc? # each port of above
+mskc* at pci? # Marvell Yukon-2
+msk* at mskc? # each port of above
fxp* at pci? # EtherExpress 10/100B ethernet
xl* at pci? # 3C9xx ethernet
pcn* at pci? # AMD PCnet-PCI Ethernet