summaryrefslogtreecommitdiff
path: root/drivers/net/phy/marvell.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2019-02-06 10:59:13 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2019-02-06 10:59:13 +1100
commitf07e63eb69bec4a434e90f6a5469bc153583595e (patch)
treee4abc9b746239a788de3f92246a4717297fdcdb5 /drivers/net/phy/marvell.c
parentbd67d564627fe4dc0f7c1b4db257d613ecd2935a (diff)
parentbf2fa12593c2bb77c7ab84254ac69af429d6719b (diff)
downloadlinux-next-f07e63eb69bec4a434e90f6a5469bc153583595e.tar.gz
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'drivers/net/phy/marvell.c')
-rw-r--r--drivers/net/phy/marvell.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index abb7876a8776..3ccba37bd6dd 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* drivers/net/phy/marvell.c
*
@@ -8,12 +9,6 @@
* Copyright (c) 2004 Freescale Semiconductor, Inc.
*
* Copyright (c) 2013 Michael Stapelberg <michael@stapelberg.de>
- *
- * 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/kernel.h>
#include <linux/string.h>