diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-17 17:57:20 -0400 |
| commit | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch) | |
| tree | a1d9511e488e19d41089ff0a736f6ce52a81c6e5 /drivers/acpi/dispatcher/dsinit.c | |
| parent | 93a0886e2368eafb9df5e2021fb185195cee88b2 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'drivers/acpi/dispatcher/dsinit.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dsinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dispatcher/dsinit.c b/drivers/acpi/dispatcher/dsinit.c index 610b1ee102b0..949f7c75029e 100644 --- a/drivers/acpi/dispatcher/dsinit.c +++ b/drivers/acpi/dispatcher/dsinit.c | |||
| @@ -151,7 +151,7 @@ acpi_ds_init_one_object(acpi_handle obj_handle, | |||
| 151 | ******************************************************************************/ | 151 | ******************************************************************************/ |
| 152 | 152 | ||
| 153 | acpi_status | 153 | acpi_status |
| 154 | acpi_ds_initialize_objects(acpi_native_uint table_index, | 154 | acpi_ds_initialize_objects(u32 table_index, |
| 155 | struct acpi_namespace_node * start_node) | 155 | struct acpi_namespace_node * start_node) |
| 156 | { | 156 | { |
| 157 | acpi_status status; | 157 | acpi_status status; |