projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.6-ns' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[cascardo/linux.git]
/
drivers
/
acpi
/
acpica
/
acnamesp.h
diff --git
a/drivers/acpi/acpica/acnamesp.h
b/drivers/acpi/acpica/acnamesp.h
index
9684ed6
..
022d69c
100644
(file)
--- a/
drivers/acpi/acpica/acnamesp.h
+++ b/
drivers/acpi/acpica/acnamesp.h
@@
-88,7
+88,7
@@
*/
acpi_status acpi_ns_initialize_objects(void);
-acpi_status acpi_ns_initialize_devices(
void
);
+acpi_status acpi_ns_initialize_devices(
u32 flags
);
/*
* nsload - Namespace loading