aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch
diff options
context:
space:
mode:
authorEtienne Haarsma <bladeoner112@gmail.com>2017-11-26 12:34:38 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-11-26 15:10:36 +0100
commit7f3dab2fc34e9b6c15d74ebf8e1d74ef601677e3 (patch)
tree8cbc6fae4a42b846360e5c6467f0ddb8896f5c8f /target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch
parentd3f40aabba83818106ce840dba9f7e76a06e721d (diff)
downloadupstream-7f3dab2fc34e9b6c15d74ebf8e1d74ef601677e3.tar.gz
upstream-7f3dab2fc34e9b6c15d74ebf8e1d74ef601677e3.tar.bz2
upstream-7f3dab2fc34e9b6c15d74ebf8e1d74ef601677e3.zip
kernel: bump 4.4 to 4.4.102
Refreshed all patches. Removed upstream ramips patch: 0063-set-CM_GCR_BASE_CMDEFTGT_MEM-according-to-datasheet.patch Compile-tested: ar71xx Run-tested: ar71xx Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com> Tested-by: Stijn Segers <francesco.borromini@inventati.org>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch b/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch
index 0d340c8278..141ea07d2a 100644
--- a/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch
+++ b/target/linux/mvebu/patches-4.4/130-phylink-add-phylink-infrastructure.patch
@@ -914,7 +914,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+MODULE_LICENSE("GPL");
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -147,6 +147,7 @@ static inline const char *phy_modes(phy_
+@@ -143,6 +143,7 @@ static inline const char *phy_modes(phy_
#define MII_ADDR_C45 (1<<30)
struct device;
@@ -922,7 +922,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
struct sk_buff;
/*
-@@ -429,6 +430,7 @@ struct phy_device {
+@@ -425,6 +426,7 @@ struct phy_device {
struct mutex lock;