diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/acpi/dispatcher/dsinit.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
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; |