diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-05-09 18:04:29 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-05-09 18:04:29 +0000 |
| commit | 86ffb46358965509aa3ee536f15cb5a4e5e04426 (patch) | |
| tree | 899e93de29f4e34dff19b0f2eae0d1c87e0bcde5 /hw/xfree86/common/xf86Init.c | |
| parent | b46d6a44fa97a3e66de828385026b7f84d9e59b8 (diff) | |
Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer)
Diffstat (limited to 'hw/xfree86/common/xf86Init.c')
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index d5741aa94..5f05e4fe9 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.33 2006/03/25 19:52:03 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.34 2006/04/04 14:17:04 ajax Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -1661,11 +1661,13 @@ ddxProcessArgument(int argc, char **argv, int i) xf86silkenMouseDisableFlag = TRUE; return 1; } +#ifdef HAVE_ACPI if (!strcmp(argv[i], "-noacpi")) { xf86acpiDisableFlag = TRUE; return 1; } +#endif if (!strcmp(argv[i], "-scanpci")) { DoScanPci(argc, argv, i); |