diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /drivers/net/ethernet/wiznet/w5100.c | |
parent | e3303268f9cfa4eb7c2217df471417d4327109fd (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
download | talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.gz talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'drivers/net/ethernet/wiznet/w5100.c')
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 8788953eaafd..bede1ff289c5 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Ethernet driver for the WIZnet W5100 chip. * * Copyright (C) 2006-2008 WIZnet Co.,Ltd. * Copyright (C) 2012 Mike Sinkovsky <msink@permonline.ru> - * - * Licensed under the GPL-2 or later. */ #include <linux/kernel.h> |