summaryrefslogtreecommitdiffstats
path: root/include/acpi/acdispat.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-17 23:57:20 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-17 23:57:20 +0200
commit393d81aa026e19b6ede6f5f11955c97ee62e5df5 (patch)
treea1d9511e488e19d41089ff0a736f6ce52a81c6e5 /include/acpi/acdispat.h
parent93a0886e2368eafb9df5e2021fb185195cee88b2 (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadtalos-op-linux-393d81aa026e19b6ede6f5f11955c97ee62e5df5.tar.gz
talos-op-linux-393d81aa026e19b6ede6f5f11955c97ee62e5df5.zip
Merge branch 'linus' into xen-64bit
Diffstat (limited to 'include/acpi/acdispat.h')
-rw-r--r--include/acpi/acdispat.h2
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);
/*
OpenPOWER on IntegriCloud