summaryrefslogtreecommitdiff
path: root/include/linux/phy.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 08:25:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-03 08:25:25 +0300
commit119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch)
tree40d834b32ce97857f3f974c95b64b6b48d415e6e /include/linux/phy.h
parent086ebf92aa791b6cc8805decffca7b8898d99a4e (diff)
parentf2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff)
downloadlinux-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.tar.xz
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/phy.h')
-rw-r--r--include/linux/phy.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 073fb151b5a9..6424586fe2d6 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Framework and drivers for configuring and reading different PHYs
* Based on code in sungem_phy.c and (long-removed) gianfar_phy.c
@@ -5,12 +6,6 @@
* Author: Andy Fleming
*
* Copyright (c) 2004 Freescale Semiconductor, Inc.
- *
- * 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.
- *
*/
#ifndef __PHY_H