From owner-svn-src-head@FreeBSD.ORG  Fri Nov 12 21:11:50 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 032B710656D5;
	Fri, 12 Nov 2010 21:11:50 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E59A08FC0A;
	Fri, 12 Nov 2010 21:11:49 +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 oACLBnrt023599;
	Fri, 12 Nov 2010 21:11:49 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACLBnui023597;
	Fri, 12 Nov 2010 21:11:49 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201011122111.oACLBnui023597@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 12 Nov 2010 21:11:49 +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: r215201 - head/sys/modules/acpi/acpi
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, 12 Nov 2010 21:11:50 -0000

Author: jkim
Date: Fri Nov 12 21:11:49 2010
New Revision: 215201
URL: http://svn.freebsd.org/changeset/base/215201

Log:
  Warn users that acpi.ko is deprecated and exit immediately unless the user
  set FORCE_BUILD.  This is to avoid foot-shooting while making MFC to stable
  branches easier.
  
  Discussed with:	jhb

Modified:
  head/sys/modules/acpi/acpi/Makefile

Modified: head/sys/modules/acpi/acpi/Makefile
==============================================================================
--- head/sys/modules/acpi/acpi/Makefile	Fri Nov 12 20:55:14 2010	(r215200)
+++ head/sys/modules/acpi/acpi/Makefile	Fri Nov 12 21:11:49 2010	(r215201)
@@ -1,5 +1,9 @@
 # $FreeBSD$
 
+.if !defined(FORCE_BUILD)
+.error "The ACPI module is deprecated, set FORCE_BUILD to force it"
+.endif
+
 .if ${MACHINE_CPUARCH} == "ia64"
 .error "ACPI can only be compiled into the kernel on the ia64 platform"
 .endif