!
! As per [1] Intel only supports this driver on 64bit platforms.
! For now restrict it to amd64.  Other architectures might be
! re-added later once tested.
!
! Remove the drivers from the global NOTES and files files and move
! them to the amd64 specifics.
! Remove the drivers from the i386 modules build and nly leave the
! amd64 version.
!
! Rather than depending on "inet" depend on "pci" and make sure that
! ixl(4) and ixlv(4) can be compiled independently [2].  This also
! allows the drivers to build properly on Iv4-only or IPv6-only
! kernels.
!
! PR:		193824 [2]
! Reviewed by:	
! MFC after:	3 days
!
! References:
! [1] http://lists.freebsd.org/pipermail/svn-src-all/2014-August/090470.html
!
Index: sys/conf/NOTES
===================================================================
--- sys/conf/NOTES	(revision 271962)
+++ sys/conf/NOTES	(working copy)
@@ -2095,8 +2095,6 @@ device		em		# Intel Pro/1000 Gigabit Ethernet
 device		igb		# Intel Pro/1000 PCIE Gigabit Ethernet
 device		ixgb		# Intel Pro/10Gbe PCI-X Ethernet
 device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
-device		ixl		# Intel XL710 40Gbe PCIE Ethernet
-device		ixlv		# Intel XL710 40Gbe VF PCIE Ethernet
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
 device		mxge		# Myricom Myri-10G 10GbE NIC
 device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter
Index: sys/conf/files
===================================================================
--- sys/conf/files	(revision 271962)
+++ sys/conf/files	(working copy)
@@ -1430,26 +1430,6 @@ dev/hptiop/hptiop.c		optional hptiop scbus
 dev/hwpmc/hwpmc_logging.c	optional hwpmc
 dev/hwpmc/hwpmc_mod.c		optional hwpmc
 dev/hwpmc/hwpmc_soft.c		optional hwpmc
-dev/ixl/if_ixl.c		optional ixl inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/if_ixlv.c		optional ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixlvc.c			optional ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_txrx.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_osdep.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_lan_hmc.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_hmc.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_common.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_nvm.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_adminq.c		optional ixl ixlv inet \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/ichsmb/ichsmb.c		optional ichsmb
 dev/ichsmb/ichsmb_pci.c		optional ichsmb pci
 dev/ida/ida.c			optional ida
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64	(revision 271962)
+++ sys/conf/files.amd64	(working copy)
@@ -192,6 +192,26 @@ dev/ipmi/ipmi_smbios.c		optional	ipmi
 dev/ipmi/ipmi_ssif.c		optional	ipmi smbus
 dev/ipmi/ipmi_pci.c		optional	ipmi pci
 dev/ipmi/ipmi_linux.c		optional	ipmi compat_linux32
+dev/ixl/if_ixl.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/if_ixlv.c		optional	ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixlvc.c			optional	ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_txrx.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_osdep.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_lan_hmc.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_hmc.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_common.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_nvm.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_adminq.c		optional	ixl pci | ixlv pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
Index: sys/amd64/conf/GENERIC
===================================================================
--- sys/amd64/conf/GENERIC	(revision 271962)
+++ sys/amd64/conf/GENERIC	(working copy)
@@ -216,6 +216,8 @@ 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		ixl			# Intel XL710 40Gbe PCIE Ethernet
+device		ixlv			# Intel XL710 40Gbe VF PCIE Ethernet
 device		le			# AMD Am7900 LANCE and Am79C9xx PCnet
 device		ti			# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp			# 3Com 3cR990 (``Typhoon'')
Index: sys/amd64/conf/NOTES
===================================================================
--- sys/amd64/conf/NOTES	(revision 271962)
+++ sys/amd64/conf/NOTES	(working copy)
@@ -310,6 +310,8 @@ options 	DRM_DEBUG	# Include debug printfs (slow)
 # iwn:	Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn
 #	802.11 network adapters
 #	Requires the iwn firmware module
+# ixl:	Intel XL710 40Gbe PCIE Ethernet
+# ixlv:	Intel XL710 40Gbe VF PCIE Ethernet
 # mlx4ib: Mellanox ConnectX HCA InfiniBand
 # mlxen: Mellanox ConnectX HCA Ethernet
 # mthca: Mellanox HCA InfiniBand
@@ -327,6 +329,8 @@ options 	ED_SIC
 device		ipw		# Intel 2100 wireless NICs.
 device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
 device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
+device		ixl		# Intel XL710 40Gbe PCIE Ethernet
+device		ixlv		# Intel XL710 40Gbe VF PCIE Ethernet
 device  	mlx4ib		# Mellanox ConnectX HCA InfiniBand
 device  	mlxen		# Mellanox ConnectX HCA Ethernet
 device  	mthca		# Mellanox HCA InfiniBand
Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile	(revision 271962)
+++ sys/modules/Makefile	(working copy)
@@ -624,8 +624,6 @@ _iwnfw=		iwnfw
 .endif
 _ixgb=		ixgb
 _ixgbe=		ixgbe
-_ixl=		ixl
-_ixlv=		ixlv
 _mly=		mly
 _nfe=		nfe
 _nvd=		nvd