diff options
author | Len Brown <len.brown@intel.com> | 2008-10-23 07:19:51 +0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-23 07:19:51 +0400 |
commit | bcb631f31839cb7c7dd56ab534b6eb4867e9161b (patch) | |
tree | d86336c9cfb22e4af69fbe73c94299a775ecc220 /drivers/acpi/resources/rscalc.c | |
parent | 955ba395616a78780e70dc3f3b0b56ca4db52e5c (diff) | |
parent | ed37a71eac8ba375d85ab10ed5f5e8bdf1cd72e0 (diff) | |
download | linux-bcb631f31839cb7c7dd56ab534b6eb4867e9161b.tar.xz |
Merge branch 'acpica' into test
Diffstat (limited to 'drivers/acpi/resources/rscalc.c')
-rw-r--r-- | drivers/acpi/resources/rscalc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c index d9063ea414e3..8eaaecf92009 100644 --- a/drivers/acpi/resources/rscalc.c +++ b/drivers/acpi/resources/rscalc.c @@ -43,7 +43,6 @@ #include <acpi/acpi.h> #include <acpi/acresrc.h> -#include <acpi/amlcode.h> #include <acpi/acnamesp.h> #define _COMPONENT ACPI_RESOURCES @@ -560,8 +559,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, ACPI_GET_OBJECT_TYPE(*sub_object_list)) || ((ACPI_TYPE_LOCAL_REFERENCE == ACPI_GET_OBJECT_TYPE(*sub_object_list)) && - ((*sub_object_list)->reference.opcode == - AML_INT_NAMEPATH_OP)))) { + ((*sub_object_list)->reference.class == + ACPI_REFCLASS_NAME)))) { name_found = TRUE; } else { /* Look at the next element */ |