diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 10:14:56 +0200 |
| commit | 48ae74443403ab25876959e84785f61bf421ccef (patch) | |
| tree | dd6d8277f2f0e691edf49a38ff9a804f9a1532d0 /include/acpi/acdispat.h | |
| parent | Merge branch 'x86/step' of git://git.kernel.org/pub/scm/linux/kernel/git/frob... (diff) | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-48ae74443403ab25876959e84785f61bf421ccef.tar.xz linux-48ae74443403ab25876959e84785f61bf421ccef.zip | |
Merge branch 'linus' into x86/step
Diffstat (limited to 'include/acpi/acdispat.h')
| -rw-r--r-- | include/acpi/acdispat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h index 910f018d92c7..21a73a105d0a 100644 --- a/include/acpi/acdispat.h +++ b/include/acpi/acdispat.h @@ -221,7 +221,7 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state); * dsinit */ acpi_status -acpi_ds_initialize_objects(acpi_native_uint table_index, +acpi_ds_initialize_objects(u32 table_index, struct acpi_namespace_node *start_node); /* |