diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 21:00:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 21:00:14 +0300 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /drivers/net/caif | |
| parent | 96524ea4be04683bb3ad8ebaedcbe3a6e34302de (diff) | |
| parent | 1e1d926369545ea09c98c6c7f5d109aa4ee0cd0b (diff) | |
| download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/caif_hsi.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_serial.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_spi_slave.c | 2 | ||||
| -rw-r--r-- | drivers/net/caif/caif_virtio.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c index 433a14b9f731..b2f10b6ad6e5 100644 --- a/drivers/net/caif/caif_hsi.c +++ b/drivers/net/caif/caif_hsi.c @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson * Dmitry.Tarnyagin / dmitry.tarnyagin@lockless.no - * License terms: GNU General Public License (GPL) version 2. */ #define pr_fmt(fmt) KBUILD_MODNAME fmt diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 44e6c7b1b222..ed3c437063dc 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/hardirq.h> diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index 7608bc3e00df..8e81bdf98ac6 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson - * License terms: GNU General Public License (GPL) version 2. */ #include <linux/init.h> diff --git a/drivers/net/caif/caif_spi_slave.c b/drivers/net/caif/caif_spi_slave.c index 39ba2f892ad6..bb776d33dd8f 100644 --- a/drivers/net/caif/caif_spi_slave.c +++ b/drivers/net/caif/caif_spi_slave.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2010 * Author: Daniel Martensson - * License terms: GNU General Public License (GPL) version 2. */ #include <linux/module.h> #include <linux/device.h> diff --git a/drivers/net/caif/caif_virtio.c b/drivers/net/caif/caif_virtio.c index 2814e0dee4bb..27e93a438dd9 100644 --- a/drivers/net/caif/caif_virtio.c +++ b/drivers/net/caif/caif_virtio.c @@ -1,9 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson AB 2013 * Authors: Vicram Arv * Dmitry Tarnyagin <dmitry.tarnyagin@lockless.no> * Sjur Brendeland - * License terms: GNU General Public License (GPL) version 2 */ #include <linux/module.h> #include <linux/if_arp.h> |