diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-30 13:37:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-30 13:37:29 +0100 |
| commit | b6c70268723bc89743b8aaaa7d17f6889d72497a (patch) | |
| tree | 32eb6544b37ec3912b1776434ce30f578bc3b9f4 /include/acpi | |
| parent | 10809bb976648ac58194a629e3d7af99e7400297 (diff) | |
| parent | a64a62ce9a380213dc9e192f762266d70c9b40ec (diff) | |
| download | linux-b6c70268723bc89743b8aaaa7d17f6889d72497a.tar.bz2 | |
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')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 | ||||
| -rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
2 files changed, 2 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 }; diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 29c691265b49..14499757338f 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -58,6 +58,7 @@ #define ACPI_VIDEO_HID "LNXVIDEO" #define ACPI_BAY_HID "LNXIOBAY" #define ACPI_DOCK_HID "LNXDOCK" +#define ACPI_ECDT_HID "LNXEC" /* Quirk for broken IBM BIOSes */ #define ACPI_SMBUS_IBM_HID "SMBUSIBM" |