From owner-svn-src-head@FreeBSD.ORG  Sun Oct 25 21:46:39 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A3D301065696;
	Sun, 25 Oct 2009 21:46:39 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 92CC48FC14;
	Sun, 25 Oct 2009 21:46:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9PLkd52069517;
	Sun, 25 Oct 2009 21:46:39 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9PLkdo3069516;
	Sun, 25 Oct 2009 21:46:39 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200910252146.n9PLkdo3069516@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Sun, 25 Oct 2009 21:46:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198475 - in head: share/man/man4 sys/dev/msk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2009 21:46:39 -0000

Author: lulf
Date: Sun Oct 25 21:46:38 2009
New Revision: 198475
URL: http://svn.freebsd.org/changeset/base/198475

Log:
  - Add support for Marvell Yukon 88E8042 device.
  
  Submitted by:	Mario Lobo <mlobo -at- digiart.art.br>
  Approved by:	yongari

Modified:
  head/share/man/man4/msk.4
  head/sys/dev/msk/if_msk.c
  head/sys/dev/msk/if_mskreg.h

Modified: head/share/man/man4/msk.4
==============================================================================
--- head/share/man/man4/msk.4	Sun Oct 25 19:13:39 2009	(r198474)
+++ head/share/man/man4/msk.4	Sun Oct 25 21:46:38 2009	(r198475)
@@ -190,6 +190,8 @@ Marvell Yukon 88E8040 Fast Ethernet
 .It
 Marvell Yukon 88E8040T Fast Ethernet
 .It
+Marvell Yukon 88E8042 Fast Ethernet
+.It
 Marvell Yukon 88E8048 Fast Ethernet
 .It
 Marvell Yukon 88E8050 Gigabit Ethernet

Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c	Sun Oct 25 19:13:39 2009	(r198474)
+++ head/sys/dev/msk/if_msk.c	Sun Oct 25 21:46:38 2009	(r198475)
@@ -201,6 +201,8 @@ static struct msk_product {
 	    "Marvell Yukon 88E8040 Fast Ethernet" },
 	{ VENDORID_MARVELL, DEVICEID_MRVL_8040T,
 	    "Marvell Yukon 88E8040T Fast Ethernet" },
+	{ VENDORID_MARVELL, DEVICEID_MRVL_8042,
+	    "Marvell Yukon 88E8042 Fast Ethernet" },
 	{ VENDORID_MARVELL, DEVICEID_MRVL_8048,
 	    "Marvell Yukon 88E8048 Fast Ethernet" },
 	{ VENDORID_MARVELL, DEVICEID_MRVL_4361,

Modified: head/sys/dev/msk/if_mskreg.h
==============================================================================
--- head/sys/dev/msk/if_mskreg.h	Sun Oct 25 19:13:39 2009	(r198474)
+++ head/sys/dev/msk/if_mskreg.h	Sun Oct 25 21:46:38 2009	(r198475)
@@ -133,6 +133,7 @@
 #define DEVICEID_MRVL_8039	0x4353
 #define DEVICEID_MRVL_8040	0x4354
 #define DEVICEID_MRVL_8040T	0x4355
+#define DEVICEID_MRVL_8042	0x4357
 #define DEVICEID_MRVL_8048	0x435A
 #define DEVICEID_MRVL_4360	0x4360
 #define DEVICEID_MRVL_4361	0x4361