diff options
author | Len Brown <len.brown@intel.com> | 2007-06-02 00:48:48 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-06-02 00:48:48 -0400 |
commit | fcf75356e9cf0460ef47a5b756bc3b0951ecab59 (patch) | |
tree | 5d5cb365b3e17a452c23a50eb9903a90578a146a /drivers/acpi/tables/tbinstal.c | |
parent | f285e3d329ce68cc355fadf4ab2c8f34d7f264cb (diff) | |
parent | 6287ee32952b502c23d54f12895c3895ddbe5013 (diff) |
Pull now into release branch
Diffstat (limited to 'drivers/acpi/tables/tbinstal.c')
-rw-r--r-- | drivers/acpi/tables/tbinstal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/tables/tbinstal.c b/drivers/acpi/tables/tbinstal.c index 0e7b121a99c..3bc0c67a928 100644 --- a/drivers/acpi/tables/tbinstal.c +++ b/drivers/acpi/tables/tbinstal.c @@ -123,14 +123,14 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, } } - /* The table must be either an SSDT or a PSDT */ + /* The table must be either an SSDT or a PSDT or an OEMx */ if ((!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT)) && - (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))) - { + (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)) + && (strncmp(table_desc->pointer->signature, "OEM", 3))) { ACPI_ERROR((AE_INFO, - "Table has invalid signature [%4.4s], must be SSDT or PSDT", + "Table has invalid signature [%4.4s], must be SSDT, PSDT or OEMx", table_desc->pointer->signature)); return_ACPI_STATUS(AE_BAD_SIGNATURE); } |