diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 12:20:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 12:20:23 +0200 |
commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /drivers/acpi/namespace/nsinit.c | |
parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/acpi/namespace/nsinit.c')
-rw-r--r-- | drivers/acpi/namespace/nsinit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c index 6d6d930c8e18..e4c57510d798 100644 --- a/drivers/acpi/namespace/nsinit.c +++ b/drivers/acpi/namespace/nsinit.c @@ -542,7 +542,6 @@ acpi_ns_init_one_device(acpi_handle obj_handle, info->prefix_node = device_node; info->pathname = METHOD_NAME__INI; info->parameters = NULL; - info->parameter_type = ACPI_PARAM_ARGS; info->flags = ACPI_IGNORE_RETURN_VALUE; /* |