Commit Graph

20 Commits

Author SHA1 Message Date
Nate Lawson
96f2784ee5 Unchanged files from ACPICA 20040220 that are off the vendor branch. 2004-02-28 20:35:57 +00:00
Nate Lawson
adfda8d3b3 Resolve conflicts. 2003-04-29 19:11:00 +00:00
Mitsuru IWASAKI
d62ab2f4a1 Resolve conflicts arising from the ACPI CA 20020815 import. 2002-08-29 01:52:27 +00:00
Mitsuru IWASAKI
98479b041b Resolve conflicts arising from the ACPI CA 20020611 import. 2002-07-09 17:54:02 +00:00
Mitsuru IWASAKI
74fc979a09 Resolve conflicts arising from the ACPI CA 20020404 import. 2002-06-30 17:53:12 +00:00
Doug Rabson
789327f183 Remove a couple of stray linuxisms to make this work for FreeBSD/ia64. 2002-03-18 10:16:57 +00:00
Mike Smith
fd87aacdcc Merge local changes for the 20020308 ACPI CA update. 2002-03-16 02:23:30 +00:00
Mike Smith
afa56f0b6d Resolve conflicts arising from the ACPI CA 20020217 import. 2002-02-23 05:16:34 +00:00
Mike Smith
1b3eb6b30c Merge local changes.
Add a fix for a minor error in the PCI routing table creation handler
where the correct size for the buffer is not returned.
2001-11-28 04:34:52 +00:00
Mike Smith
21479890f4 Merge local changes, add new files and remove obsoleted ones. 2001-10-31 02:34:45 +00:00
Mike Smith
947ff3286e Merge our local patches into the 20010920 snapshot. Note that the
"implicit return" hack in psparse.c was resubmitted by Iwasaki-san.

Submitted by:	iwasaki
2001-10-04 23:15:26 +00:00
Mike Smith
0aa8447171 Merge our local branch changes with the 20010831 snapshot. 2001-09-07 02:52:26 +00:00
Mike Smith
4bccc7175f - wbinvd isn't an inline on ia64.
- includes are not in subdirectories.
2001-05-29 20:03:32 +00:00
Mike Smith
6d804030e6 Merge FreeBSD-specific changes with the ACPI CA 20010518 release. 2001-05-29 19:56:18 +00:00
Mike Smith
497b08a07e Resolve merge conflicts. 2001-03-05 02:16:51 +00:00
Mike Smith
520334620f Merge conflicts from the ACPI CA 20010125 import. 2001-01-31 09:44:45 +00:00
Mike Smith
88c6b9ae21 Resolve conflicts from the ACPI CA 20001215 vendor import. 2000-12-21 07:04:32 +00:00
Mike Smith
aa3f504fb9 Resolve conflicts from the 20001201 merge. 2000-12-08 09:22:18 +00:00
Mike Smith
31239e0d37 FreeBSD-specific customisations:
- Set debugger options for kernel build
 - Define some missing functions
 - Bring in GCC defines
 - Disable the 'wbinvd' macro as it conflicts with our inline
2000-10-28 07:29:08 +00:00
Mike Smith
926328c406 Initial import of the Intel-maintained ACPI Component Architecture. This
is Intel's reference implementation of the core operating-system ACPI
support.  (This import is on the vendor branch.)
2000-10-28 05:01:06 +00:00