Date: Sat, 20 Nov 2010 16:42:19 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r215571 - stable/8/sys/dev/acpica Message-ID: <201011201642.oAKGgJ7L018898@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201011201642.oAKGgJ7L018898>