diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 11:00:14 -0700 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/dma/stm32-dma.c | |
| parent | 96524ea4be04683bb3ad8ebaedcbe3a6e34302de (diff) | |
| parent | 1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b (diff) | |
| download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/dma/stm32-dma.c')
| -rw-r--r-- | drivers/dma/stm32-dma.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index 88d9c6c4389f..da41bab98f5b 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Driver for STM32 DMA controller * @@ -6,8 +7,6 @@ * Copyright (C) M'boumba Cedric Madianga 2015 * Author: M'boumba Cedric Madianga <cedric.madianga@gmail.com> * Pierre-Yves Mordret <pierre-yves.mordret@st.com> - * - * License terms: GNU General Public License (GPL), version 2 */ #include <linux/clk.h> |