diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-05-15 18:27:09 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-05-15 18:27:09 +0000 |
| commit | f7b2f4f3e5dd3bfae236ac02bb8d6b311ea2baa1 (patch) | |
| tree | e08cd505e2f0e2a1a1f4214d8da056356b41a50b | |
| parent | 1a628eabafd8b204f799e5841e4efdf038deb792 (diff) | |
Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_acpi.c | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2006-05-15 Adam Jackson <ajax@freedesktop.org> + * 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 <ajax@freedesktop.org> + * Xext/sync.c: Bug #6903: Fix a crash in the Sync extension. (Søren Sandmann) 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" |