diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-02 12:03:12 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-02 12:03:12 +0300 |
| commit | 83e63b2cc416904b50895eeee8d8e0d7ea0418fe (patch) | |
| tree | 2566eb9c07ecaffaac8f033b63dfca4d2cf51a9a /include/linux/dma/ti-cppi5.h | |
| parent | c699e02d83c9877a552ef2d4a89f804fb025112e (diff) | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
| download | linux-83e63b2cc416904b50895eeee8d8e0d7ea0418fe.tar.xz | |
Merge 5.10-rc2 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/dma/ti-cppi5.h')
| -rw-r--r-- | include/linux/dma/ti-cppi5.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dma/ti-cppi5.h b/include/linux/dma/ti-cppi5.h index 5896441ee604..efa2f0309f00 100644 --- a/include/linux/dma/ti-cppi5.h +++ b/include/linux/dma/ti-cppi5.h @@ -47,7 +47,7 @@ struct cppi5_host_desc_t { u32 buf_info1; u32 org_buf_len; u64 org_buf_ptr; - u32 epib[0]; + u32 epib[]; } __packed; #define CPPI5_DESC_MIN_ALIGN (16U) @@ -139,7 +139,7 @@ struct cppi5_desc_epib_t { */ struct cppi5_monolithic_desc_t { struct cppi5_desc_hdr_t hdr; - u32 epib[0]; + u32 epib[]; }; #define CPPI5_INFO2_MDESC_DATA_OFFSET_SHIFT (18U) |