svn commit: r267323 - stable/9/sys/i386/conf

[Marius Strobl]

Author: marius
Date: Tue Jun 10 09:36:10 2014
New Revision: 267323
URL: http://svnweb.freebsd.org/changeset/base/267323

Log:
  MFC: r266820 (partial)
  
  - Shrink the list of excluded modules to what actually still doesn't build
    as of r267058.
  - Some style cleanups.
  
  Approved by:	re (glebius)

Modified:
  stable/9/sys/i386/conf/XEN
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/i386/conf/XEN
==============================================================================
--- stable/9/sys/i386/conf/XEN	Tue Jun 10 09:33:58 2014	(r267322)
+++ stable/9/sys/i386/conf/XEN	Tue Jun 10 09:36:10 2014	(r267323)
@@ -7,11 +7,12 @@ cpu		I686_CPU
 ident		XEN
 
 makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
-makeoptions	WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mpr mps mwl nve rdma sound sym trm xfs"
+
+# The following modules don't build with PAE and XEN enabled.
+makeoptions	WITHOUT_MODULES="ctl dpt drm drm2 hptmv ida malo mwl rdma xfs"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
-#options 	SCHED_4BSD		 
 
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
@@ -65,7 +66,6 @@ options 	MCLSHIFT=12
 options 	SMP			# Symmetric MultiProcessor Kernel
 device		apic			# I/O APIC
 
-
 #device		atkbdc		# AT keyboard controller
 #device		atkbd		# AT keyboard
 device		psm		# PS/2 mouse
@@ -87,4 +87,3 @@ device		faith		# IPv6-to-IPv4 relaying (
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
 device		bpf		# Berkeley packet filter
-