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 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
psxface.c
diff --git
a/drivers/acpi/acpica/psxface.c
b/drivers/acpi/acpica/psxface.c
index
c42f067
..
8086805
100644
(file)
--- a/
drivers/acpi/acpica/psxface.c
+++ b/
drivers/acpi/acpica/psxface.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
@@
-47,7
+47,6
@@
#include "acdispat.h"
#include "acinterp.h"
#include "actables.h"
#include "acdispat.h"
#include "acinterp.h"
#include "actables.h"
-#include "amlcode.h"
#define _COMPONENT ACPI_PARSER
ACPI_MODULE_NAME("psxface")
#define _COMPONENT ACPI_PARSER
ACPI_MODULE_NAME("psxface")
@@
-285,15
+284,15
@@
acpi_status acpi_ps_execute_method(struct acpi_evaluate_info *info)
goto cleanup;
}
goto cleanup;
}
- if (info->obj_desc->method.
flags & AOPOBJ
_MODULE_LEVEL) {
+ if (info->obj_desc->method.
info_flags & ACPI_METHOD
_MODULE_LEVEL) {
walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
}
/* Invoke an internal method if necessary */
walk_state->parse_flags |= ACPI_PARSE_MODULE_LEVEL;
}
/* Invoke an internal method if necessary */
- if (info->obj_desc->method.
method_flags & AML
_METHOD_INTERNAL_ONLY) {
+ if (info->obj_desc->method.
info_flags & ACPI
_METHOD_INTERNAL_ONLY) {
status =
status =
- info->obj_desc->method.
extra
.implementation(walk_state);
+ info->obj_desc->method.
dispatch
.implementation(walk_state);
info->return_object = walk_state->return_desc;
/* Cleanup states */
info->return_object = walk_state->return_desc;
/* Cleanup states */