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 branch 'linus' into release
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
utobject.c
diff --git
a/drivers/acpi/utilities/utobject.c
b/drivers/acpi/acpica/utobject.c
similarity index 99%
rename from
drivers/acpi/utilities/utobject.c
rename to
drivers/acpi/acpica/utobject.c
index
4bef3cf
..
fd5ea75
100644
(file)
--- a/
drivers/acpi/utilities/utobject.c
+++ b/
drivers/acpi/acpica/utobject.c
@@
-42,7
+42,8
@@
*/
#include <acpi/acpi.h>
-#include <acpi/acnamesp.h>
+#include "accommon.h"
+#include "acnamesp.h"
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utobject")