diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 19:52:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 19:52:08 +0100 |
| commit | 1b07db3178ba11e7e64a4d04e3dd57c8e2ceeb3f (patch) | |
| tree | 63ac93f475e2f41b5425cfe7ba392e81299b3c5a /drivers/acpi/acpica/utresrc.c | |
| parent | Merge branches 'acpi-config', 'acpi-osl', 'acpi-utils' and 'acpi-tables' (diff) | |
| parent | ACPICA: Events: Always modify GPE registers under the GPE lock (diff) | |
| download | linux-1b07db3178ba11e7e64a4d04e3dd57c8e2ceeb3f.tar.xz linux-1b07db3178ba11e7e64a4d04e3dd57c8e2ceeb3f.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Events: Always modify GPE registers under the GPE lock
ACPICA: Save current masks of enabled GPEs after enable register writes
ACPICA: Update version to 20141107.
ACPICA: Disassembler: Emit correct string for 0 stop bits.
ACPICA: Disassembler: Update for C-style expressions.
ACPICA: Disassembler: Add support for C-style operators and expressions.
ACPICA: acpiexec: Add option to specify an object initialization file.
ACPICA: iASL: Add support for to_PLD macro.
Diffstat (limited to 'drivers/acpi/acpica/utresrc.c')
| -rw-r--r-- | drivers/acpi/acpica/utresrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c index 5cd017c7ac0e..bc1ff820c7dd 100644 --- a/drivers/acpi/acpica/utresrc.c +++ b/drivers/acpi/acpica/utresrc.c @@ -263,7 +263,7 @@ const char *acpi_gbl_bpb_decode[] = { /* UART serial bus stop bits */ const char *acpi_gbl_sb_decode[] = { - "StopBitsNone", + "StopBitsZero", "StopBitsOne", "StopBitsOnePlusHalf", "StopBitsTwo" |