diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:51:34 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:51:34 +0000 |
commit | 93b50ade934436d00e5f68c3feabf030ace8d98d (patch) | |
tree | 50c113c26115c6815362f0c4a24d03b75c571a76 /target/linux/lantiq/patches-4.1 | |
parent | ba3a749f9b29b40784bb576651142c601d4a7211 (diff) | |
download | master-31e0f0ae-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.gz master-31e0f0ae-93b50ade934436d00e5f68c3feabf030ace8d98d.tar.bz2 master-31e0f0ae-93b50ade934436d00e5f68c3feabf030ace8d98d.zip |
kernel/4.1: update to version 4.1.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48223
Diffstat (limited to 'target/linux/lantiq/patches-4.1')
-rw-r--r-- | target/linux/lantiq/patches-4.1/0025-NET-MIPS-lantiq-adds-xrx200-net.patch | 4 | ||||
-rw-r--r-- | target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/lantiq/patches-4.1/0025-NET-MIPS-lantiq-adds-xrx200-net.patch b/target/linux/lantiq/patches-4.1/0025-NET-MIPS-lantiq-adds-xrx200-net.patch index 35a2e18a05..8784b5b505 100644 --- a/target/linux/lantiq/patches-4.1/0025-NET-MIPS-lantiq-adds-xrx200-net.patch +++ b/target/linux/lantiq/patches-4.1/0025-NET-MIPS-lantiq-adds-xrx200-net.patch @@ -16,7 +16,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig -@@ -101,7 +101,13 @@ +@@ -101,7 +101,13 @@ config LANTIQ_ETOP tristate "Lantiq SoC ETOP driver" depends on SOC_TYPE_XWAY ---help--- @@ -33,7 +33,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net source "drivers/net/ethernet/mellanox/Kconfig" --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile -@@ -43,6 +43,7 @@ +@@ -43,6 +43,7 @@ obj-$(CONFIG_IP1000) += icplus/ obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_KORINA) += korina.o obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o diff --git a/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch b/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch index b2cd3565ae..c8288f925c 100644 --- a/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch +++ b/target/linux/lantiq/patches-4.1/0050-MIPS-lantiq-add-clk_round_rate.patch @@ -17,9 +17,9 @@ Cc: <stable@vger.kernel.org> # 4.1+ --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c -@@ -99,6 +99,23 @@ int clk_set_rate(struct clk *clk, unsign +@@ -116,6 +116,23 @@ long clk_round_rate(struct clk *clk, uns } - EXPORT_SYMBOL(clk_set_rate); + EXPORT_SYMBOL(clk_round_rate); +long clk_round_rate(struct clk *clk, unsigned long rate) +{ |