PERFORCE change 42184 for review

[John Baldwin]

http://perforce.freebsd.org/chv.cgi?CH=42184

Change 42184 by jhb at jhb_blue on 2003/11/12 15:07:05

	IFC @42183.

Affected files ...

.. //depot/projects/smpng/sys/pci/if_sk.c#24 integrate
.. //depot/projects/smpng/sys/pci/if_skreg.h#4 integrate

Differences ...

==== //depot/projects/smpng/sys/pci/if_sk.c#24 (text+ko) ====

@@ -85,7 +85,7 @@
  */
  
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.67 2003/11/07 22:04:26 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.68 2003/11/12 23:01:15 wilko Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sys/pci/if_sk.c,v 1.67 2003/11/07 22:04:26 peter Exp $";
+  "$FreeBSD: src/sys/pci/if_sk.c,v 1.68 2003/11/12 23:01:15 wilko Exp $";
 #endif
 
 static struct sk_type sk_devs[] = {
@@ -152,6 +152,11 @@
 		"SysKonnect Gigabit Ethernet (V2.0)"
 	},
 	{
+		VENDORID_MARVELL,
+		DEVICEID_SK_V2,
+		"Marvell Gigabit Ethernet"
+	},
+	{
 		VENDORID_3COM,
 		DEVICEID_3COM_3C940,
 		"3Com 3C940 Gigabit Ethernet"

==== //depot/projects/smpng/sys/pci/if_skreg.h#4 (text+ko) ====

@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/pci/if_skreg.h,v 1.17 2003/11/07 22:04:26 peter Exp $
+ * $FreeBSD: src/sys/pci/if_skreg.h,v 1.18 2003/11/12 23:01:15 wilko Exp $
  */
 
 /*
@@ -60,6 +60,11 @@
 #define VENDORID_SK		0x1148
 
 /*
+ * Marvell PCI vendor ID
+ */
+#define VENDORID_MARVELL	0x11AB
+
+/*
  * SK-NET gigabit ethernet device IDs
  */
 #define DEVICEID_SK_V1		0x4300