diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 14:29:03 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 14:29:03 +0300 |
| commit | 90b45399b4418a3542fe096b92840b3bf235e78e (patch) | |
| tree | a75e3e37503be4fe4c7d718248bd5a844c8705e1 /arch/arc/plat-axs10x/Makefile | |
| parent | e39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
| download | linux-90b45399b4418a3542fe096b92840b3bf235e78e.tar.xz | |
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc/plat-axs10x/Makefile')
| -rw-r--r-- | arch/arc/plat-axs10x/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arc/plat-axs10x/Makefile b/arch/arc/plat-axs10x/Makefile index d4748f27f86e..cebe5716ee19 100644 --- a/arch/arc/plat-axs10x/Makefile +++ b/arch/arc/plat-axs10x/Makefile @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # # Copyright (C) 2013-15 Synopsys, Inc. (www.synopsys.com) # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# obj-$(CONFIG_ARC_PLAT_AXS10X) += axs10x.o |