From owner-svn-src-head@FreeBSD.ORG  Fri Jan  8 09:16:37 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B71F1106566B;
	Fri,  8 Jan 2010 09:16:37 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A73C88FC18;
	Fri,  8 Jan 2010 09:16:37 +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 o089GbSt027073;
	Fri, 8 Jan 2010 09:16:37 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o089Gblb027071;
	Fri, 8 Jan 2010 09:16:37 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201001080916.o089Gblb027071@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 8 Jan 2010 09:16:37 +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: r201774 - head/sys/i386/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Jan 2010 09:16:37 -0000

Author: alc
Date: Fri Jan  8 09:16:37 2010
New Revision: 201774
URL: http://svn.freebsd.org/changeset/base/201774

Log:
  Catch up with r183101 that added "device acpi" to GENERIC.

Modified:
  head/sys/i386/conf/PAE

Modified: head/sys/i386/conf/PAE
==============================================================================
--- head/sys/i386/conf/PAE	Fri Jan  8 07:57:43 2010	(r201773)
+++ head/sys/i386/conf/PAE	Fri Jan  8 09:16:37 2010	(r201774)
@@ -10,10 +10,6 @@ ident		PAE-GENERIC
 # To make a PAE kernel, the next option is needed
 options 	PAE			# Physical Address Extensions Kernel
 
-# Compile acpi in statically since the module isn't built properly.  Most
-# machines which support large amounts of memory require acpi.
-device		acpi
-
 # Don't build modules with this kernel config, since they are not built with
 # the correct options headers.
 makeoptions	NO_MODULES=yes