diff options
| author | Rafael J. Wysocki | 2017-11-30 13:37:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-11-30 13:37:29 +0100 |
| commit | b6c70268723bc89743b8aaaa7d17f6889d72497a (patch) | |
| tree | 32eb6544b37ec3912b1776434ce30f578bc3b9f4 /include/acpi/acpi_bus.h | |
| parent | ACPI / bus: Leave modalias empty for devices which are not present (diff) | |
| parent | ACPI / EC: Fix regression related to PM ops support in ECDT device (diff) | |
| download | kernel-qcow2-linux-b6c70268723bc89743b8aaaa7d17f6889d72497a.tar.gz kernel-qcow2-linux-b6c70268723bc89743b8aaaa7d17f6889d72497a.tar.xz kernel-qcow2-linux-b6c70268723bc89743b8aaaa7d17f6889d72497a.zip | |
Merge branch 'acpi-ec' into acpi
* acpi-ec:
ACPI / EC: Fix regression related to PM ops support in ECDT device
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f849be28e082..79287629c888 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -105,6 +105,7 @@ enum acpi_bus_device_type { ACPI_BUS_TYPE_THERMAL, ACPI_BUS_TYPE_POWER_BUTTON, ACPI_BUS_TYPE_SLEEP_BUTTON, + ACPI_BUS_TYPE_ECDT_EC, ACPI_BUS_DEVICE_TYPE_COUNT }; |