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/block | |
| parent | abad1451586d8e8b36f86ef2772cef81d4ce2651 (diff) | |
| parent | 2962e19b55e970c7a2f1b0048abf1ef95463c6f5 (diff) | |
| download | barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.gz barebox-a2501c9e889abd22b47d42956d27b02607dbb0d8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/block/Makefile | 2 | ||||
| -rw-r--r-- | drivers/block/efi-block-io.c | 2 | ||||
| -rw-r--r-- | drivers/block/virtio_blk.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index e34b4929a8..68a11438dc 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only config VIRTIO_BLK bool "Virtio block driver" depends on VIRTIO diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 5748deec45..c50bdc1d02 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -1,3 +1,3 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_EFI_BOOTUP) += efi-block-io.o obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c index 5fd82296dc..ff0e467d2c 100644 --- a/drivers/block/efi-block-io.c +++ b/drivers/block/efi-block-io.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 <init.h> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 87ab505f83..660f3a7b6b 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2018, Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> * Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com> |