From owner-svn-src-stable-7@FreeBSD.ORG  Tue Dec 22 14:58:44 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 833B310656C1;
	Tue, 22 Dec 2009 14:58:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 71FBB8FC1C;
	Tue, 22 Dec 2009 14:58:44 +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 nBMEwiFg067299;
	Tue, 22 Dec 2009 14:58:44 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBMEwioW067297;
	Tue, 22 Dec 2009 14:58:44 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912221458.nBMEwioW067297@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 22 Dec 2009 14:58:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200842 - stable/7/sys/i386/conf
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2009 14:58:44 -0000

Author: jhb
Date: Tue Dec 22 14:58:44 2009
New Revision: 200842
URL: http://svn.freebsd.org/changeset/base/200842

Log:
  MFC 200514:
  Remove comment claiming that building acpi into the kernel is deprecated.

Modified:
  stable/7/sys/i386/conf/NOTES
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/i386/conf/NOTES
==============================================================================
--- stable/7/sys/i386/conf/NOTES	Tue Dec 22 14:58:23 2009	(r200841)
+++ stable/7/sys/i386/conf/NOTES	Tue Dec 22 14:58:44 2009	(r200842)
@@ -510,9 +510,6 @@ device		tdfx_linux		# Enable Linuxulator
 # defined when it is built).
 #
 # ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
-#
-# Note that building ACPI into the kernel is deprecated; the module is
-# normally loaded automatically by the loader.
 
 device		acpi
 options 	ACPI_DEBUG