diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /include/acpi/acpi.h | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/acpi/acpi.h')
| -rw-r--r-- | include/acpi/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi.h b/include/acpi/acpi.h index ad53252dd42d..a69d78942040 100644 --- a/include/acpi/acpi.h +++ b/include/acpi/acpi.h | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | * We put them here because we don't want to duplicate them | 49 | * We put them here because we don't want to duplicate them |
| 50 | * in the rest of the source code again and again. | 50 | * in the rest of the source code again and again. |
| 51 | */ | 51 | */ |
| 52 | #include "acnames.h" /* Global ACPI names and strings */ | ||
| 52 | #include "acconfig.h" /* Configuration constants */ | 53 | #include "acconfig.h" /* Configuration constants */ |
| 53 | #include "platform/acenv.h" /* Target environment specific items */ | 54 | #include "platform/acenv.h" /* Target environment specific items */ |
| 54 | #include "actypes.h" /* Fundamental common data types */ | 55 | #include "actypes.h" /* Fundamental common data types */ |