svn commit: r280226 - in head/sys: mips/conf modules powerpc/conf

[Jack F Vogel]

Author: jfv
Date: Wed Mar 18 16:54:03 2015
New Revision: 280226
URL: https://svnweb.freebsd.org/changeset/base/280226

Log:
  Correct the ixgbe entries in mips and powerpc, and add the module
  entries in i386/amd64 in the Makefile

Modified:
  head/sys/mips/conf/OCTEON1
  head/sys/modules/Makefile
  head/sys/powerpc/conf/GENERIC64

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Wed Mar 18 16:06:04 2015	(r280225)
+++ head/sys/mips/conf/OCTEON1	Wed Mar 18 16:54:03 2015	(r280226)
@@ -196,7 +196,8 @@ device		octm
 device		de		# DEC/Intel DC21x4x (``Tulip'')
 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		ix		# Intel PRO/10GbE PF PCIE Ethernet Family
+device		ixv		# Intel PRO/10GbE VF PCIE Ethernet Family
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp		# 3Com 3cR990 (``Typhoon'')

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Wed Mar 18 16:06:04 2015	(r280225)
+++ head/sys/modules/Makefile	Wed Mar 18 16:54:03 2015	(r280226)
@@ -511,6 +511,8 @@ _io=		io
 .if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _ipoib=         ipoib
 .endif
+_ix=		ix
+_ixv=		ixv
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
 _linux=		linux

Modified: head/sys/powerpc/conf/GENERIC64
==============================================================================
--- head/sys/powerpc/conf/GENERIC64	Wed Mar 18 16:06:04 2015	(r280225)
+++ head/sys/powerpc/conf/GENERIC64	Wed Mar 18 16:54:03 2015	(r280226)
@@ -136,7 +136,8 @@ device		uart_z8530
 # 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		ix		# Intel PRO/10GbE PCIE PF Ethernet Family
+device		ixv		# Intel PRO/10GbE PCIE VF Ethernet Family
 device		glc		# Sony Playstation 3 Ethernet
 device		llan		# IBM pSeries Virtual Ethernet