svn commit: r292213 - stable/10/sys/i386/conf

[Hans Petter Selasky]

Author: hselasky
Date: Mon Dec 14 15:45:11 2015
New Revision: 292213
URL: https://svnweb.freebsd.org/changeset/base/292213

Log:
  Fix the XEN build by disabling the mlx5 and mlx5en modules
  when XEN is enabled.
  
  This is a direct commit to stable/10.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/i386/conf/XEN

Modified: stable/10/sys/i386/conf/XEN
==============================================================================
--- stable/10/sys/i386/conf/XEN	Mon Dec 14 15:44:34 2015	(r292212)
+++ stable/10/sys/i386/conf/XEN	Mon Dec 14 15:45:11 2015	(r292213)
@@ -14,6 +14,9 @@ makeoptions	WITHOUT_MODULES="ctl cxgb dp
 # The following drivers don't work with PAE enabled.
 makeoptions	WITHOUT_MODULES+="asr ncr pst"
 
+# The following drivers don't build with XEN enabled.
+makeoptions	WITHOUT_MODULES+="mlx5 mlx5en"
+
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption