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 | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | ACPICA: fix memory leak in acpi_ev_pci_config_region_setup() error path (diff) | |
| download | linux-dev-d9ff963801e4f7648c55a27413a1b1de59480a30.tar.xz linux-dev-d9ff963801e4f7648c55a27413a1b1de59480a30.zip | |
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 @@ /*! [Begin] no source code translation */ -#if defined(__linux__) +#if defined(_LINUX) || defined(__linux__) #include "aclinux.h" #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 @@ #define ACPI_USE_NATIVE_DIVIDE #endif +#ifndef __cdecl #define __cdecl +#endif + #define ACPI_FLUSH_CPU_CACHE() #endif /* __KERNEL__ */ |