diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2022-05-05 22:09:35 +1000 |
| commit | d0a31acc34dc2921ad32a67a7534704114e64f82 (patch) | |
| tree | 2b77d8d61170c5f9633c49eaddd67dca5bb9c38f /drivers/platform/x86/think-lmi.h | |
| parent | f06351f8c0c85e2d53e73c53a33b4ef55b4ad6de (diff) | |
| parent | af2d861d4cd2a4da5137f795ee3509e6f944a25b (diff) | |
Merge tag 'v5.18-rc4' into next
Merge master into next, to bring in commit 5f24d5a579d1 ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
Diffstat (limited to 'drivers/platform/x86/think-lmi.h')
| -rw-r--r-- | drivers/platform/x86/think-lmi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/platform/x86/think-lmi.h b/drivers/platform/x86/think-lmi.h index 4f69df6eed07..4daba6151cd6 100644 --- a/drivers/platform/x86/think-lmi.h +++ b/drivers/platform/x86/think-lmi.h @@ -63,7 +63,6 @@ struct tlmi_pwd_setting { int index; /*Used for HDD and NVME auth */ enum level_option level; bool cert_installed; - char *certificate; char *signature; char *save_signature; }; |