[src/trunk]: src/sys/arch/sandpoint/conf Synology boxes need sk(4), not msk(4).

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d0c607645960
branches:  trunk
changeset: 754693:d0c607645960
user:      phx <phx%NetBSD.org@localhost>
date:      Sat May 08 18:03:15 2010 +0000

description:
Synology boxes need sk(4), not msk(4).

diffstat:

 sys/arch/sandpoint/conf/GENERIC     |  8 ++++----
 sys/arch/sandpoint/conf/GENERIC.NAS |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 5c52124e4933 -r d0c607645960 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC   Sat May 08 16:57:24 2010 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC   Sat May 08 18:03:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.45 2009/12/05 20:11:16 pooka Exp $
+# $NetBSD: GENERIC,v 1.46 2010/05/08 18:03:15 phx Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.45 $"
+#ident                 "GENERIC-$Revision: 1.46 $"
 
 maxusers       32
 
@@ -194,8 +194,8 @@
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B
 tlp*   at pci? dev ? function ?        # DEC Tulip and similar
 re*    at pci? dev ? function ?        # Realtek 8139C+/8169/8169S/8110S
-mskc*  at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
-msk*   at mskc?                        # Marvell Yukon 2 Gigabit Ethernet
+skc*   at pci? dev ? function ?        # Marvell Yukon Gigabit Ethernet
+sk*    at skc?                         # Marvell Yukon Gigabit Ethernet
 wm*    at pci? dev ? function ?        # Intel 8254x gigabit
 
 inphy* at mii? phy ?                   # Intel 82555 PHYs
diff -r 5c52124e4933 -r d0c607645960 sys/arch/sandpoint/conf/GENERIC.NAS
--- a/sys/arch/sandpoint/conf/GENERIC.NAS       Sat May 08 16:57:24 2010 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC.NAS       Sat May 08 18:03:15 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.NAS,v 1.11 2009/12/05 20:11:16 pooka Exp $
+# $NetBSD: GENERIC.NAS,v 1.12 2010/05/08 18:03:15 phx Exp $
 #
 # machine description file for GENERIC.NAS
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC.NAS-$Revision: 1.11 $"
+#ident                 "GENERIC.NAS-$Revision: 1.12 $"
 
 maxusers       32
 
@@ -180,8 +180,8 @@
 # PCI network interfaces
 tlp*   at pci? dev ? function ?        # DEC Tulip and similar
 re*    at pci? dev ? function ?        # Realtek 8139C+/8169/8169S/8110S
-mskc*  at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
-msk*   at mskc?                        # Marvell Yukon 2 Gigabit Ethernet
+skc*   at pci? dev ? function ?        # Marvell Yukon Gigabit Ethernet
+sk*    at skc?                         # Marvell Yukon Gigabit Ethernet
 wm*    at pci? dev ? function ?        # Intel 8254x gigabit
 fxp*   at pci? dev ? function ?        # Intel EtherExpress PRO 10+/100B