projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
[linux-2.6]
/
drivers
/
acpi
/
acpica
/
dsmthdat.c
diff --git
a/drivers/acpi/acpica/dsmthdat.c
b/drivers/acpi/acpica/dsmthdat.c
index
da0f546
..
22b1a3c
100644
(file)
--- a/
drivers/acpi/acpica/dsmthdat.c
+++ b/
drivers/acpi/acpica/dsmthdat.c
@@
-713,6
+713,6
@@
acpi_ds_method_data_get_type(u16 opcode,
/* Get the object type */
- return_VALUE(
ACPI_GET_OBJECT_TYPE(object)
);
+ return_VALUE(
object->type
);
}
#endif