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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
evrgnini.c
diff --git
a/drivers/acpi/acpica/evrgnini.c
b/drivers/acpi/acpica/evrgnini.c
index
0b47a6d
..
55a5d35
100644
(file)
--- a/
drivers/acpi/acpica/evrgnini.c
+++ b/
drivers/acpi/acpica/evrgnini.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
@@
-590,9
+590,9
@@
acpi_ev_initialize_region(union acpi_operand_object *region_obj,
* See acpi_ns_exec_module_code
*/
if (obj_desc->method.
* See acpi_ns_exec_module_code
*/
if (obj_desc->method.
-
flags & AOPOBJ
_MODULE_LEVEL) {
+
info_flags & ACPI_METHOD
_MODULE_LEVEL) {
handler_obj =
handler_obj =
- obj_desc->method.
extra
.handler;
+ obj_desc->method.
dispatch
.handler;
}
break;
}
break;
@@
-637,7
+637,7
@@
acpi_ev_initialize_region(union acpi_operand_object *region_obj,
status =
acpi_ev_execute_reg_method
status =
acpi_ev_execute_reg_method
- (region_obj,
1
);
+ (region_obj,
ACPI_REG_CONNECT
);
if (acpi_ns_locked) {
status =
if (acpi_ns_locked) {
status =