diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:08:51 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:08:51 +0100 |
| commit | 94e14da890b1b68526b5f87ff1c97f374fd2471e (patch) | |
| tree | ad17c794208b02cd2ae24d67ab7e9c14c2fd43c5 /drivers/firmware/efi/efi.c | |
| parent | 5367601b52696004f363e4f6c0b228b5bbf7d8b7 (diff) | |
| parent | d1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff) | |
Merge 5.5-rc2 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/efi/efi.c')
| -rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index d101f072c8f8..407816da9fcb 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -681,7 +681,7 @@ device_initcall(efi_load_efivars); { name }, \ { prop }, \ offsetof(struct efi_fdt_params, field), \ - FIELD_SIZEOF(struct efi_fdt_params, field) \ + sizeof_field(struct efi_fdt_params, field) \ } struct params { |