diff options
| author | Len Brown <len.brown@intel.com> | 2005-02-16 07:49:10 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-02-16 07:49:10 -0500 |
| commit | 3d53ecae24df7eef1c31f3f18f9fb8db5be09d9c (patch) | |
| tree | 566efd441e8d88d3e8bbc1eb43796e9de31f17d0 /include | |
| parent | 9694f9761a60be72698361cc543e0310b05aec31 (diff) | |
| parent | ce919ce106fdc1e27cbc27b4a2556d9d3cd79c7a (diff) | |
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acconfig.h | 2 | ||||
| -rw-r--r-- | include/acpi/acinterp.h | 5 | ||||
| -rw-r--r-- | include/acpi/platform/aclinux.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index a830919a1de4..6701c11b406b 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -64,7 +64,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20050125 +#define ACPI_CA_VERSION 0x20050211 /* * OS name, used for the _OS object. The _OS object is essentially obsolete, diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index 6a5cbb355685..78395916e4cf 100644 --- a/include/acpi/acinterp.h +++ b/include/acpi/acinterp.h @@ -217,8 +217,8 @@ acpi_ex_opcode_6A_0T_1R ( u8 acpi_ex_do_match ( u32 match_op, - acpi_integer package_value, - acpi_integer match_value); + union acpi_operand_object *package_obj, + union acpi_operand_object *match_obj); acpi_status acpi_ex_get_object_reference ( @@ -617,6 +617,7 @@ acpi_ex_store_object_to_object ( acpi_status acpi_ex_store_buffer_to_buffer ( + acpi_object_type original_src_type, union acpi_operand_object *source_desc, union acpi_operand_object *target_desc); diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index d807f2981d95..a3de0db85694 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -81,6 +81,8 @@ #define ACPI_USE_NATIVE_DIVIDE #endif +#define __cdecl +#define ACPI_FLUSH_CPU_CACHE() #endif /* __KERNEL__ */ /* Linux uses GCC */ |