git.openpandora.org
/
pandora-kernel.git
/ 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/davem/net
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
aclocal.h
diff --git
a/drivers/acpi/acpica/aclocal.h
b/drivers/acpi/acpica/aclocal.h
index
c7f743c
..
5552125
100644
(file)
--- a/
drivers/acpi/acpica/aclocal.h
+++ b/
drivers/acpi/acpica/aclocal.h
@@
-357,6
+357,7
@@
struct acpi_predefined_data {
char *pathname;
const union acpi_predefined_info *predefined;
union acpi_operand_object *parent_package;
+ struct acpi_namespace_node *node;
u32 flags;
u8 node_flags;
};