diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/acpi/acdispat.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
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); | |||
| 221 | * dsinit | 221 | * dsinit |
| 222 | */ | 222 | */ |
| 223 | acpi_status | 223 | acpi_status |
| 224 | acpi_ds_initialize_objects(acpi_native_uint table_index, | 224 | acpi_ds_initialize_objects(u32 table_index, |
| 225 | struct acpi_namespace_node *start_node); | 225 | struct acpi_namespace_node *start_node); |
| 226 | 226 | ||
| 227 | /* | 227 | /* |