diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-06-26 12:24:42 +0200 |
commit | 2c92d787cc9fad57d05c96bd117782183768258a (patch) | |
tree | 51c0c567b8be2fd56073a8ce31f8ebd123a7d562 /drivers/dma/moxart-dma.c | |
parent | 145a773aef83181d47ebab21bb33c89233aadb1e (diff) | |
parent | 8be3a53e18e0e1a98f288f6c7f5e9da3adbe9c49 (diff) |
Merge branch 'linus' into x86/entry, to resolve conflicts
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/dma/moxart-dma.c')
-rw-r--r-- | drivers/dma/moxart-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/moxart-dma.c b/drivers/dma/moxart-dma.c index 4ab493d46375..347146a6e1d0 100644 --- a/drivers/dma/moxart-dma.c +++ b/drivers/dma/moxart-dma.c @@ -127,7 +127,7 @@ struct moxart_desc { unsigned int dma_cycles; struct virt_dma_desc vd; uint8_t es; - struct moxart_sg sg[0]; + struct moxart_sg sg[]; }; struct moxart_chan { |