diff options
author | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
---|---|---|
committer | Rafael J. Wysocki | 2017-06-22 16:28:35 +0200 |
commit | d07ff6523b1ed24d636365f8479b0db70946dc14 (patch) | |
tree | 802bf35ed93ee4941e193cac24d0888af917913e /drivers/char/tpm/tpm_crb.c | |
parent | ACPI / PM: Ignore spurious SCI wakeups from suspend-to-idle (diff) | |
parent | thermal: int340x_thermal: fix compile after the UUID API switch (diff) | |
download | kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.gz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.tar.xz kernel-qcow2-linux-d07ff6523b1ed24d636365f8479b0db70946dc14.zip |
Merge branch 'uuid-types'
Merge branch 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
to satisfy dependencies.
Diffstat (limited to 'drivers/char/tpm/tpm_crb.c')
-rw-r--r-- | drivers/char/tpm/tpm_crb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index b917b9d5f710..c378c7b15d49 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -27,10 +27,9 @@ #define ACPI_SIG_TPM2 "TPM2" -static const u8 CRB_ACPI_START_UUID[] = { - /* 0000 */ 0xAB, 0x6C, 0xBF, 0x6B, 0x63, 0x54, 0x14, 0x47, - /* 0008 */ 0xB7, 0xCD, 0xF0, 0x20, 0x3C, 0x03, 0x68, 0xD4 -}; +static const guid_t crb_acpi_start_guid = + GUID_INIT(0x6BBF6CAB, 0x5463, 0x4714, + 0xB7, 0xCD, 0xF0, 0x20, 0x3C, 0x03, 0x68, 0xD4); enum crb_defaults { CRB_ACPI_START_REVISION_ID = 1, @@ -266,7 +265,7 @@ static int crb_do_acpi_start(struct tpm_chip *chip) int rc; obj = acpi_evaluate_dsm(chip->acpi_dev_handle, - CRB_ACPI_START_UUID, + &crb_acpi_start_guid, CRB_ACPI_START_REVISION_ID, CRB_ACPI_START_INDEX, NULL); |