Index: sys/conf/files
===================================================================
--- sys/conf/files
+++ sys/conf/files
@@ -2259,6 +2259,36 @@
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
 dev/ixgbe/ixgbe_dcb_82599.c	optional ix inet | ixv inet \
 	compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixl/if_ixl.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_main.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_qmgr.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_iov.c		optional	ixl pci  pci_iov \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_i2c.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/if_iavf.c		optional	iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/iavf_vc.c			optional	iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_txrx.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_osdep.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_lan_hmc.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_hmc.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_common.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_nvm.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_adminq.c		optional	ixl pci | iavf pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_dcb.c		optional	ixl pci \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/jedec_dimm/jedec_dimm.c	optional jedec_dimm smbus
 dev/jme/if_jme.c		optional jme pci
 dev/kbd/kbd.c			optional atkbd | pckbd | sc | ukbd | vt
Index: sys/conf/files.amd64
===================================================================
--- sys/conf/files.amd64
+++ sys/conf/files.amd64
@@ -146,36 +146,6 @@
 dev/hyperv/vmbus/amd64/vmbus_vector.S			optional	hyperv
 dev/ioat/ioat.c			optional	ioat pci
 dev/ioat/ioat_test.c		optional	ioat pci
-dev/ixl/if_ixl.c		optional	ixl pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_main.c		optional	ixl pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_qmgr.c		optional	ixl pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_iov.c		optional	ixl pci  pci_iov \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_pf_i2c.c		optional	ixl pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/if_iavf.c		optional	iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/iavf_vc.c			optional	iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/ixl_txrx.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_osdep.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_lan_hmc.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_hmc.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_common.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_nvm.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_adminq.c		optional	ixl pci | iavf pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
-dev/ixl/i40e_dcb.c		optional	ixl pci \
-	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/nctgpio/nctgpio.c		optional	nctgpio
 dev/nfe/if_nfe.c		optional	nfe pci
 dev/ntb/if_ntb/if_ntb.c		optional	if_ntb
Index: sys/conf/options
===================================================================
--- sys/conf/options
+++ sys/conf/options
@@ -1011,3 +1011,6 @@
 # gcov support
 GCOV		opt_global.h
 LINDEBUGFS
+
+# iWARP client interface support in ixl
+IXL_IW		opt_ixl.h
Index: sys/conf/options.amd64
===================================================================
--- sys/conf/options.amd64
+++ sys/conf/options.amd64
@@ -46,9 +46,6 @@
 
 ATKBD_DFLT_KEYMAP	opt_atkbd.h
 
-# iWARP client interface support in ixl
-IXL_IW			opt_ixl.h
-
 # -------------------------------
 # EOF
 # -------------------------------