diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 16:40:14 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 16:40:14 +0200 |
commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
tree | 85205005c611ab774702148558321c6fb92f1ccd /include/acpi/acinterp.h | |
parent | CPUFREQ: S3C24XX NAND driver frequency scaling support. (diff) | |
parent | UBI: always start the background thread (diff) | |
download | linux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.tar.xz linux-ff877ea80efa2015b6263766f78ee42c2a1b32f9.zip |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/acpi/acinterp.h')
-rw-r--r-- | include/acpi/acinterp.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/acpi/acinterp.h b/include/acpi/acinterp.h index e249ce5d3300..e8db7a3143a5 100644 --- a/include/acpi/acinterp.h +++ b/include/acpi/acinterp.h @@ -366,10 +366,7 @@ void acpi_ex_dump_operand(union acpi_operand_object *obj_desc, u32 depth); void acpi_ex_dump_operands(union acpi_operand_object **operands, - acpi_interpreter_mode interpreter_mode, - char *ident, - u32 num_levels, - char *note, char *module_name, u32 line_number); + const char *opcode_name, u32 num_opcodes); #ifdef ACPI_FUTURE_USAGE void |