diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 02:22:43 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 02:22:43 -0400 |
| commit | d9ff963801e4f7648c55a27413a1b1de59480a30 (patch) | |
| tree | d3d45c850eb03629835d6970651123800c0d8ba8 /include/acpi | |
| parent | d7fff6f4d1ed1bc31577df887fefcb1541923367 (diff) | |
| parent | e6917317c0f6a930442c40dc38a6f21710adf961 (diff) | |
Pull acpica into release branch
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/platform/acenv.h | 2 | ||||
| -rw-r--r-- | include/acpi/platform/aclinux.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index dab2ec59a3b0..c785485e62a6 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h | |||
| @@ -136,7 +136,7 @@ | |||
| 136 | 136 | ||
| 137 | /*! [Begin] no source code translation */ | 137 | /*! [Begin] no source code translation */ |
| 138 | 138 | ||
| 139 | #if defined(__linux__) | 139 | #if defined(_LINUX) || defined(__linux__) |
| 140 | #include "aclinux.h" | 140 | #include "aclinux.h" |
| 141 | 141 | ||
| 142 | #elif defined(_AED_EFI) | 142 | #elif defined(_AED_EFI) |
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index a568717f98c6..6ed15a0978eb 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -91,7 +91,10 @@ | |||
| 91 | #define ACPI_USE_NATIVE_DIVIDE | 91 | #define ACPI_USE_NATIVE_DIVIDE |
| 92 | #endif | 92 | #endif |
| 93 | 93 | ||
| 94 | #ifndef __cdecl | ||
| 94 | #define __cdecl | 95 | #define __cdecl |
| 96 | #endif | ||
| 97 | |||
| 95 | #define ACPI_FLUSH_CPU_CACHE() | 98 | #define ACPI_FLUSH_CPU_CACHE() |
| 96 | #endif /* __KERNEL__ */ | 99 | #endif /* __KERNEL__ */ |
| 97 | 100 | ||