diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-12-31 19:31:21 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-12-31 19:31:21 +0530 |
| commit | 7c2269e95883a2123dc5c273df54d6c9e05ab880 (patch) | |
| tree | 74f3ddc31876ec04f541d21d09ca9375cd555335 /drivers/dma | |
| parent | f7f41722efacc121cbfd36a8480cd2e66223479d (diff) | |
| parent | 80c4445e56f4f237d8c89ec4cee58d9218f55c18 (diff) | |
Merge branch 'topic/bcm' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/bcm2835-dma.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index cad55ab80d41..1a44c8086d77 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * BCM2835 DMA engine support * @@ -18,16 +19,6 @@ * * MARVELL MMP Peripheral DMA Driver * Copyright 2012 Marvell International Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include <linux/dmaengine.h> #include <linux/dma-mapping.h> @@ -1056,4 +1047,4 @@ module_platform_driver(bcm2835_dma_driver); MODULE_ALIAS("platform:bcm2835-dma"); MODULE_DESCRIPTION("BCM2835 DMA engine driver"); MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>"); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); |