diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 23:24:44 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-10-20 23:24:45 +0200 |
| commit | 5cec64e5f97efa55a3f0a7f625263e66d09198f7 (patch) | |
| tree | 349bbe2eaa43a4323da0a151274d08086e5e92f2 | |
| parent | 17c129caec5de2190dbf469ddee78ff0d182b379 (diff) | |
| parent | 5923ddaa95a7e61e827a3d9b1d9c749963d8db90 (diff) | |
Merge tag 'sunxi-core-for-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/soc
Platform core changes for the Allwinner SoCs, this time adding SPDX
headers to our files.
* tag 'sunxi-core-for-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: sunxi: Add a missing SPDX license header
ARM: sunxi: Add a missing SPDX license header
Link: https://lore.kernel.org/r/0ceaad3e-dc26-4be6-b98f-d25e51a41b81.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-sunxi/platsmp.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-sunxi/platsmp.c b/arch/arm/mach-sunxi/platsmp.c index bdde9ef3aaa9..052097e78e6e 100644 --- a/arch/arm/mach-sunxi/platsmp.c +++ b/arch/arm/mach-sunxi/platsmp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SMP support for Allwinner SoCs * @@ -8,9 +9,6 @@ * Based on code * Copyright (C) 2012-2013 Allwinner Ltd. * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/delay.h> diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index 19635721013d..e1b7945aac99 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Device Tree support for Allwinner A1X SoCs * @@ -5,9 +6,6 @@ * * Maxime Ripard <maxime.ripard@free-electrons.com> * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include <linux/clocksource.h> |