diff options
author | Tony Lindgren <tony@atomide.com> | 2017-11-28 19:12:32 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-11-28 19:12:32 +0300 |
commit | bc686442f8a601bccac1f22506ecdb4b0d62cadd (patch) | |
tree | b224ab4aa2350b233da640f5850f48bc6bfeb2d0 /arch/mips/loongson64 | |
parent | 60636a5d0fa2f8bc6d0c23c4027100ba20866f9b (diff) | |
parent | ca41e244517d6d3f1600c229ff7ca615049c1e9c (diff) | |
download | linux-bc686442f8a601bccac1f22506ecdb4b0d62cadd.tar.xz |
Merge branch 'dts-fixes' into omap-for-v4.15/fixes-dt
Diffstat (limited to 'arch/mips/loongson64')
-rw-r--r-- | arch/mips/loongson64/Kconfig | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/common/Makefile | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/common/dma-swiotlb.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/loongson-3/acpi_init.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/loongson-3/hpet.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/loongson-3/irq.c | 1 | ||||
-rw-r--r-- | arch/mips/loongson64/loongson-3/smp.h | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/arch/mips/loongson64/Kconfig b/arch/mips/loongson64/Kconfig index 8e6e292675b2..0d249fc3cfe9 100644 --- a/arch/mips/loongson64/Kconfig +++ b/arch/mips/loongson64/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 if MACH_LOONGSON64 choice diff --git a/arch/mips/loongson64/common/Makefile b/arch/mips/loongson64/common/Makefile index 074d9cb15cd2..8235ac7eac95 100644 --- a/arch/mips/loongson64/common/Makefile +++ b/arch/mips/loongson64/common/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for loongson based machines. # diff --git a/arch/mips/loongson64/common/dma-swiotlb.c b/arch/mips/loongson64/common/dma-swiotlb.c index 34486c138206..ef07740cee61 100644 --- a/arch/mips/loongson64/common/dma-swiotlb.c +++ b/arch/mips/loongson64/common/dma-swiotlb.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/mm.h> #include <linux/init.h> #include <linux/dma-mapping.h> diff --git a/arch/mips/loongson64/loongson-3/acpi_init.c b/arch/mips/loongson64/loongson-3/acpi_init.c index dbdad79ead8f..8d7c119ddf91 100644 --- a/arch/mips/loongson64/loongson-3/acpi_init.c +++ b/arch/mips/loongson64/loongson-3/acpi_init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/io.h> #include <linux/init.h> #include <linux/ioport.h> diff --git a/arch/mips/loongson64/loongson-3/hpet.c b/arch/mips/loongson64/loongson-3/hpet.c index 4df9d4b7356a..ed15430ad64f 100644 --- a/arch/mips/loongson64/loongson-3/hpet.c +++ b/arch/mips/loongson64/loongson-3/hpet.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <linux/pci.h> #include <linux/percpu.h> diff --git a/arch/mips/loongson64/loongson-3/irq.c b/arch/mips/loongson64/loongson-3/irq.c index 7202e52cd046..cbeb20f9fc95 100644 --- a/arch/mips/loongson64/loongson-3/irq.c +++ b/arch/mips/loongson64/loongson-3/irq.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <loongson.h> #include <irq.h> #include <linux/interrupt.h> diff --git a/arch/mips/loongson64/loongson-3/smp.h b/arch/mips/loongson64/loongson-3/smp.h index d98ff654b7d7..957bde81e0e4 100644 --- a/arch/mips/loongson64/loongson-3/smp.h +++ b/arch/mips/loongson64/loongson-3/smp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __LOONGSON_SMP_H_ #define __LOONGSON_SMP_H_ |