From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 25 03:57:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD1B9106566B;
	Wed, 25 Jan 2012 03:57:43 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C7FFC8FC13;
	Wed, 25 Jan 2012 03:57:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0P3vh9e005927;
	Wed, 25 Jan 2012 03:57:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0P3vhkx005925;
	Wed, 25 Jan 2012 03:57:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201201250357.q0P3vhkx005925@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 25 Jan 2012 03:57:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230524 - projects/pseries/powerpc/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Jan 2012 03:57:43 -0000

Author: nwhitehorn
Date: Wed Jan 25 03:57:43 2012
New Revision: 230524
URL: http://svn.freebsd.org/changeset/base/230524

Log:
  Add Intel network controllers commonly found on IBM hardware to GENERIC64.

Modified:
  projects/pseries/powerpc/conf/GENERIC64

Modified: projects/pseries/powerpc/conf/GENERIC64
==============================================================================
--- projects/pseries/powerpc/conf/GENERIC64	Wed Jan 25 03:51:14 2012	(r230523)
+++ projects/pseries/powerpc/conf/GENERIC64	Wed Jan 25 03:57:43 2012	(r230524)
@@ -124,6 +124,9 @@ device		scc
 device		uart
 
 # Ethernet hardware
+device		em		# Intel PRO/1000 Gigabit Ethernet Family
+device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
 device		glc		# Sony Playstation 3 Ethernet
 
 # PCI Ethernet NICs that use the common MII bus controller code.