diff options
| author | Len Brown <len.brown@intel.com> | 2009-11-25 00:04:48 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-11-25 00:04:48 -0500 |
| commit | a4257763de8cfac0d72503a10c69f7f07ae727a9 (patch) | |
| tree | c9bdf08e78a398dfccd30b923da999e46db89c11 /drivers/acpi | |
| parent | 87c687be055e67bc04189ce476690be73d16063e (diff) | |
| parent | d0b3b119f4d9460f3947334cf384ae69c5417360 (diff) | |
Merge branch 'bugzilla-14379' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/acpredef.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h index cd80d1dd1950..57bdaf6ffab1 100644 --- a/drivers/acpi/acpica/acpredef.h +++ b/drivers/acpi/acpica/acpredef.h | |||
| @@ -203,8 +203,9 @@ static const union acpi_predefined_info predefined_names[] = | |||
| 203 | {{"_BCT", 1, ACPI_RTYPE_INTEGER}}, | 203 | {{"_BCT", 1, ACPI_RTYPE_INTEGER}}, |
| 204 | {{"_BDN", 0, ACPI_RTYPE_INTEGER}}, | 204 | {{"_BDN", 0, ACPI_RTYPE_INTEGER}}, |
| 205 | {{"_BFS", 1, 0}}, | 205 | {{"_BFS", 1, 0}}, |
| 206 | {{"_BIF", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (9 Int),(4 Str) */ | 206 | {{"_BIF", 0, ACPI_RTYPE_PACKAGE} }, /* Fixed-length (9 Int),(4 Str/Buf) */ |
| 207 | {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9, ACPI_RTYPE_STRING}, 4,0}}, | 207 | {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9, |
| 208 | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER}, 4, 0} }, | ||
| 208 | 209 | ||
| 209 | {{"_BIX", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int),(4 Str) */ | 210 | {{"_BIX", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int),(4 Str) */ |
| 210 | {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING}, 4, | 211 | {{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING}, 4, |