diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-29 15:31:43 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-29 15:31:43 +0200 |
| commit | 2670e02a2deab4ea513a37a1356be5fad6e5156b (patch) | |
| tree | b09b6ed3d55f7a5b0444d905e15829d17e9fc68a /drivers/acpi | |
| parent | fe82dcec644244676d55a1384c958d5f67979adb (diff) | |
| parent | 48c1947c53163afaadb3f140f46f5d968d405f5c (diff) | |
| download | linux-stable-2670e02a2deab4ea513a37a1356be5fad6e5156b.tar.gz linux-stable-2670e02a2deab4ea513a37a1356be5fad6e5156b.tar.bz2 linux-stable-2670e02a2deab4ea513a37a1356be5fad6e5156b.zip | |
Merge back earlier 'acpica' material for v3.18.
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpica/utresrc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c index 14cb6c0c8be2..5cd017c7ac0e 100644 --- a/drivers/acpi/acpica/utresrc.c +++ b/drivers/acpi/acpica/utresrc.c @@ -87,7 +87,9 @@ const char *acpi_gbl_io_decode[] = { const char *acpi_gbl_ll_decode[] = { "ActiveHigh", - "ActiveLow" + "ActiveLow", + "ActiveBoth", + "Reserved" }; const char *acpi_gbl_max_decode[] = { |