From owner-svn-src-all@FreeBSD.ORG  Tue Dec 28 21:20:58 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE4F7106566C;
	Tue, 28 Dec 2010 21:20:58 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ADB2E8FC12;
	Tue, 28 Dec 2010 21:20:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBSLKwfc077526;
	Tue, 28 Dec 2010 21:20:58 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBSLKwJQ077524;
	Tue, 28 Dec 2010 21:20:58 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201012282120.oBSLKwJQ077524@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 28 Dec 2010 21:20:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216776 - head/sys/i386/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 21:20:58 -0000

Author: imp
Date: Tue Dec 28 21:20:58 2010
New Revision: 216776
URL: http://svn.freebsd.org/changeset/base/216776

Log:
  Remove mem, io, isa and npx since they are duplicative of the entries
  in DEFAULTS.  Saves 8 lines of warnings when we build XBOX.

Modified:
  head/sys/i386/conf/XBOX

Modified: head/sys/i386/conf/XBOX
==============================================================================
--- head/sys/i386/conf/XBOX	Tue Dec 28 21:18:58 2010	(r216775)
+++ head/sys/i386/conf/XBOX	Tue Dec 28 21:20:58 2010	(r216776)
@@ -47,8 +47,6 @@ options 	TIMER_FREQ=1125000	# Gives ~733
 
 #device		apic			# I/O APIC
 
-# Bus support.  Do not remove isa, even if you have no isa slots
-device		isa
 device		pci
 
 # ATA and ATAPI devices
@@ -61,13 +59,8 @@ options 	ATA_STATIC_ID	# Static device n
 device		scbus		# SCSI bus (required for SCSI)
 device		da		# Direct Access (disks)
 
-# Floating point support - do not disable.
-device		npx
-
 # Pseudo devices.
 device		loop		# Network loopback
-device		mem		# Memory and kernel memory devices
-device		io		# I/O device
 device		random		# Entropy device
 device		ether		# Ethernet support
 #device		tun		# Packet tunnel.