diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-12-15 08:25:16 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-12-15 08:25:16 +0100 |
commit | a2501c9e889abd22b47d42956d27b02607dbb0d8 (patch) | |
tree | f30b5c829fe0adcc784c143aaf436abb6eb9724d /drivers/video | |
parent | abad1451586d8e8b36f86ef2772cef81d4ce2651 (diff) | |
parent | 2962e19b55e970c7a2f1b0048abf1ef95463c6f5 (diff) | |
download | barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.gz barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/Makefile | 2 | ||||
-rw-r--r-- | drivers/video/atmel_lcdfb.h | 2 | ||||
-rw-r--r-- | drivers/video/backlight.c | 2 | ||||
-rw-r--r-- | drivers/video/edid.c | 2 | ||||
-rw-r--r-- | drivers/video/edid.h | 2 | ||||
-rw-r--r-- | drivers/video/efi_gop.c | 2 | ||||
-rw-r--r-- | drivers/video/fb.c | 2 | ||||
-rw-r--r-- | drivers/video/fbconsole.c | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/Makefile | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/ipufb.c | 2 | ||||
-rw-r--r-- | drivers/video/imx-ipu-v3/ipuv3-plane.h | 2 | ||||
-rw-r--r-- | drivers/video/imx.c | 2 | ||||
-rw-r--r-- | drivers/video/of_display_timing.c | 2 | ||||
-rw-r--r-- | drivers/video/sdl.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6dc8769f2c..a87e8c0638 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only menuconfig VIDEO bool "Video drivers" help diff --git a/drivers/video/Makefile b/drivers/video/Makefile index a0e416db26..8344bdd2af 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_VIDEO) += fb.o obj-$(CONFIG_DRIVER_VIDEO_EDID) += edid.o obj-$(CONFIG_OFDEVICE) += of_display_timing.o diff --git a/drivers/video/atmel_lcdfb.h b/drivers/video/atmel_lcdfb.h index f383dccb5e..110c71bdb2 100644 --- a/drivers/video/atmel_lcdfb.h +++ b/drivers/video/atmel_lcdfb.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <fb.h> #include <video/atmel_lcdc.h> diff --git a/drivers/video/backlight.c b/drivers/video/backlight.c index 5dadb058af..6c00cc115e 100644 --- a/drivers/video/backlight.c +++ b/drivers/video/backlight.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <driver.h> #include <linux/list.h> diff --git a/drivers/video/edid.c b/drivers/video/edid.c index ac5fd18d24..96489f2a37 100644 --- a/drivers/video/edid.c +++ b/drivers/video/edid.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * drivers/video/edid.c * diff --git a/drivers/video/edid.h b/drivers/video/edid.h index 8b793aeb74..b4bd578c96 100644 --- a/drivers/video/edid.h +++ b/drivers/video/edid.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * drivers/video/edid.h - EDID/DDC Header * diff --git a/drivers/video/efi_gop.c b/drivers/video/efi_gop.c index 45dc42fa3e..52387f30dc 100644 --- a/drivers/video/efi_gop.c +++ b/drivers/video/efi_gop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright 2011 Intel Corporation; author Matt Fleming * Copyright (c) 2017 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> diff --git a/drivers/video/fb.c b/drivers/video/fb.c index 8e369f1c35..1c93dafbc9 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <malloc.h> #include <fb.h> diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c index 4623f7e3ae..070378aa23 100644 --- a/drivers/video/fbconsole.c +++ b/drivers/video/fbconsole.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <errno.h> #include <malloc.h> diff --git a/drivers/video/imx-ipu-v3/Kconfig b/drivers/video/imx-ipu-v3/Kconfig index 645c1b788e..4429e815cd 100644 --- a/drivers/video/imx-ipu-v3/Kconfig +++ b/drivers/video/imx-ipu-v3/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only config DRIVER_VIDEO_IMX_IPUV3 bool "i.MX IPUv3 driver" depends on ARCH_IMX diff --git a/drivers/video/imx-ipu-v3/Makefile b/drivers/video/imx-ipu-v3/Makefile index b92ba55ed1..709a9203a3 100644 --- a/drivers/video/imx-ipu-v3/Makefile +++ b/drivers/video/imx-ipu-v3/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-common.o ipu-dmfc.o ipu-di.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dp.o ipuv3-plane.o ipufb.o obj-$(CONFIG_DRIVER_VIDEO_IMX_IPUV3) += ipu-dc.o diff --git a/drivers/video/imx-ipu-v3/ipufb.c b/drivers/video/imx-ipu-v3/ipufb.c index f0b95d0fbc..628f98d81a 100644 --- a/drivers/video/imx-ipu-v3/ipufb.c +++ b/drivers/video/imx-ipu-v3/ipufb.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Freescale i.MX Frame Buffer device driver * diff --git a/drivers/video/imx-ipu-v3/ipuv3-plane.h b/drivers/video/imx-ipu-v3/ipuv3-plane.h index 3c54643c4f..cade98e3e9 100644 --- a/drivers/video/imx-ipu-v3/ipuv3-plane.h +++ b/drivers/video/imx-ipu-v3/ipuv3-plane.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __IPUV3_PLANE_H__ #define __IPUV3_PLANE_H__ diff --git a/drivers/video/imx.c b/drivers/video/imx.c index dae3bdd9a8..612e06d45a 100644 --- a/drivers/video/imx.c +++ b/drivers/video/imx.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Freescale i.MX Frame Buffer device driver * diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index a7d391bc23..6fe1e1b08b 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * OF helpers for parsing display timings * diff --git a/drivers/video/sdl.c b/drivers/video/sdl.c index 19a8b53623..28a41916eb 100644 --- a/drivers/video/sdl.c +++ b/drivers/video/sdl.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2012 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> */ |