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 /net/ethernet | |
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 'net/ethernet')
-rw-r--r-- | net/ethernet/eth.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index b70d5482997a..17374afee28f 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * INET An implementation of the TCP/IP protocol suite for the LINUX * operating system. INET is implemented using the BSD Socket @@ -31,11 +32,6 @@ * older network drivers and IFF_ALLMULTI. * Christer Weinigel : Better rebuild header message. * Andrew Morton : 26Feb01: kill ether_setup() - use netdev_boot_setup(). - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. */ #include <linux/module.h> #include <linux/types.h> |