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/bus | |
| parent | abad1451586d8e8b36f86ef2772cef81d4ce2651 (diff) | |
| parent | 2962e19b55e970c7a2f1b0048abf1ef95463c6f5 (diff) | |
| download | barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.gz barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/bus/Makefile | 2 | ||||
| -rw-r--r-- | drivers/bus/acpi.c | 2 | ||||
| -rw-r--r-- | drivers/bus/imx-weim.c | 2 | ||||
| -rw-r--r-- | drivers/bus/mvebu-mbus.c | 2 | ||||
| -rw-r--r-- | drivers/bus/omap-gpmc.c | 2 | ||||
| -rw-r--r-- | drivers/bus/ti-sysc.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index b4237040a3..e622ed239c 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only menu "Bus devices" config BUS_OMAP_GPMC diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index be2dacf5e8..2c54b3ea30 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_BUS_OMAP_GPMC) += omap-gpmc.o obj-$(CONFIG_IMX_WEIM) += imx-weim.o obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o diff --git a/drivers/bus/acpi.c b/drivers/bus/acpi.c index 54c6085657..63d3f618b4 100644 --- a/drivers/bus/acpi.c +++ b/drivers/bus/acpi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2019 Ahmad Fatoum */ diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 498e536064..01a35cfc9f 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * EIM driver for Freescale's i.MX chips * diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index f0a1dfd2aa..46fe5dd398 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Address map functions for Marvell EBU SoCs (Kirkwood, Armada * 370/XP, Dove, Orion5x and MV78xx0) diff --git a/drivers/bus/omap-gpmc.c b/drivers/bus/omap-gpmc.c index 960fd4658f..5f65d59911 100644 --- a/drivers/bus/omap-gpmc.c +++ b/drivers/bus/omap-gpmc.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * OMAP GPMC driver. Based upon the corresponding Linux Code * diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index af52d839bd..ff9d2f81cd 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2019 Phytec Messtechnik GmbH, Teresa Remmet <t.remmet@phytec.de> */ |