diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 07:41:27 -0400 |
| commit | 2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b (patch) | |
| tree | 45c4575110c61ca181196c038e1579f0f4fb0174 /include/acpi/acdispat.h | |
| parent | 34646bca474142e1424e5f6c4a33cb2ba0930ea1 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/paravirt-spinlocks
Conflicts:
arch/x86/kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 | /* |