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 'devicetree/merge' into spi/merge
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
nsaccess.c
diff --git
a/drivers/acpi/acpica/nsaccess.c
b/drivers/acpi/acpica/nsaccess.c
index
0cd925b
..
d93172f
100644
(file)
--- a/
drivers/acpi/acpica/nsaccess.c
+++ b/
drivers/acpi/acpica/nsaccess.c
@@
-5,7
+5,7
@@
******************************************************************************/
/*
******************************************************************************/
/*
- * Copyright (C) 2000 - 201
0
, Intel Corp.
+ * Copyright (C) 2000 - 201
1
, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-163,9
+163,9
@@
acpi_status acpi_ns_root_initialize(void)
#else
/* Mark this as a very SPECIAL method */
#else
/* Mark this as a very SPECIAL method */
- obj_desc->method.
method
_flags =
- A
ML
_METHOD_INTERNAL_ONLY;
- obj_desc->method.
extra
.implementation =
+ obj_desc->method.
info
_flags =
+ A
CPI
_METHOD_INTERNAL_ONLY;
+ obj_desc->method.
dispatch
.implementation =
acpi_ut_osi_implementation;
#endif
break;
acpi_ut_osi_implementation;
#endif
break;