From f7b2f4f3e5dd3bfae236ac02bb8d6b311ea2baa1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 15 May 2006 18:27:09 +0000 Subject: Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 7 +++++++ configure.ac | 2 +- hw/xfree86/os-support/linux/lnx_acpi.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e891ec62..5b5b5f2b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-05-15 Adam Jackson + + * configure.ac: + * hw/xfree86/os-support/linux/lnx_acpi.c: + Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery + Inozemtsev) + 2006-05-15 Adam Jackson * Xext/sync.c: diff --git a/configure.ac b/configure.ac index 891537a1d..1f1bc45c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1065,7 +1065,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then XORG_OS_PCI="axp" xorg_bus_linuxpci="no" ;; - x86*) + i*86|amd64*|x86_64*) linux_acpi="yes" ;; *) diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c index 3d048c750..0c69ea172 100644 --- a/hw/xfree86/os-support/linux/lnx_acpi.c +++ b/hw/xfree86/os-support/linux/lnx_acpi.c @@ -1,3 +1,7 @@ +#ifdef HAVE_XORG_CONFIG_H +#include "xorg-config.h" +#endif + #include "os.h" #include "xf86.h" #include "xf86Priv.h" -- cgit v1.2.3