From owner-svn-src-all@FreeBSD.ORG  Sat Nov 20 16:42:19 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 C237D1065670;
	Sat, 20 Nov 2010 16:42:19 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B0B238FC08;
	Sat, 20 Nov 2010 16:42:19 +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 oAKGgJao018900;
	Sat, 20 Nov 2010 16:42:19 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAKGgJ7L018898;
	Sat, 20 Nov 2010 16:42:19 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201011201642.oAKGgJ7L018898@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sat, 20 Nov 2010 16:42:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215571 - stable/8/sys/dev/acpica
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: Sat, 20 Nov 2010 16:42:19 -0000

Author: avg
Date: Sat Nov 20 16:42:19 2010
New Revision: 215571
URL: http://svn.freebsd.org/changeset/base/215571

Log:
  fix a mismerge in r215521: MFC imports of ACPICA revisions 20100428
  through 20101013
  
  The mismerge resulted in ia64 build breakage.
  This is a direct commit.
  
  Pointyhat to:	avg

Modified:
  stable/8/sys/dev/acpica/acpi.c

Modified: stable/8/sys/dev/acpica/acpi.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi.c	Sat Nov 20 16:03:53 2010	(r215570)
+++ stable/8/sys/dev/acpica/acpi.c	Sat Nov 20 16:42:19 2010	(r215571)
@@ -2314,6 +2314,7 @@ acpi_sleep_force(void *arg)
 int
 acpi_ReqSleepState(struct acpi_softc *sc, int state)
 {
+#if defined(__amd64__) || defined(__i386__)
 #if defined(__i386__)
     struct apm_clone_data *clone;
 #endif
@@ -2326,7 +2327,6 @@ acpi_ReqSleepState(struct acpi_softc *sc
 
     ACPI_LOCK(acpi);
 
-#if defined(__amd64__) || defined(__i386__)
     /* If a suspend request is already in progress, just return. */
     if (sc->acpi_next_sstate != 0) {
     	ACPI_UNLOCK(acpi);