diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 16:51:14 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-26 16:51:14 +0200 |
commit | 603ea288dc53dfabf823bf7d38e401a945309492 (patch) | |
tree | 6260717cd4254283d71f5e671b02cb89305f768d /drivers/firmware/pcdp.h | |
parent | ea0efd687b01355cd799c8643d0c636ba4859ffc (diff) | |
parent | 48778464bb7d346b47157d21ffde2af6b2d39110 (diff) | |
download | linux-603ea288dc53dfabf823bf7d38e401a945309492.tar.bz2 |
Merge 5.8-rc2 into usb-linus
Felipe has based his patches on that tag, so update my usb-linus branch
to it as well so that I can pull his patches in here easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/pcdp.h')
-rw-r--r-- | drivers/firmware/pcdp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/pcdp.h b/drivers/firmware/pcdp.h index ce75d1da9e84..e02540571c52 100644 --- a/drivers/firmware/pcdp.h +++ b/drivers/firmware/pcdp.h @@ -103,6 +103,6 @@ struct pcdp { u8 creator_id[4]; u32 creator_rev; u32 num_uarts; - struct pcdp_uart uart[0]; /* actual size is num_uarts */ + struct pcdp_uart uart[]; /* actual size is num_uarts */ /* remainder of table is pcdp_device structures */ } __attribute__((packed)); |