From 61fef497bbe02a4a5955b9246ade876d7027f5cf Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 5 Nov 2013 08:25:45 +0000 Subject: kernel: update 3.10 to 3.10.18 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38652 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../0025-net-mv643xx_eth-add-DT-parsing-support.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch') diff --git a/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch b/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch index 897b261745..e0eac008be 100644 --- a/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch +++ b/target/linux/kirkwood/patches-3.10/0025-net-mv643xx_eth-add-DT-parsing-support.patch @@ -116,7 +116,7 @@ Signed-off-by: David S. Miller #include static char mv643xx_eth_driver_name[] = "mv643xx_eth"; -@@ -2453,13 +2456,148 @@ static void infer_hw_params(struct mv643 +@@ -2452,13 +2455,148 @@ static void infer_hw_params(struct mv643 } } @@ -266,7 +266,7 @@ Signed-off-by: David S. Miller if (!mv643xx_eth_version_printed++) pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n", -@@ -2472,6 +2610,7 @@ static int mv643xx_eth_shared_probe(stru +@@ -2471,6 +2609,7 @@ static int mv643xx_eth_shared_probe(stru msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL); if (msp == NULL) return -ENOMEM; @@ -274,7 +274,7 @@ Signed-off-by: David S. Miller msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res)); if (msp->base == NULL) -@@ -2488,12 +2627,15 @@ static int mv643xx_eth_shared_probe(stru +@@ -2487,12 +2626,15 @@ static int mv643xx_eth_shared_probe(stru if (dram) mv643xx_eth_conf_mbus_windows(msp, dram); @@ -292,7 +292,7 @@ Signed-off-by: David S. Miller return 0; } -@@ -2501,9 +2643,9 @@ static int mv643xx_eth_shared_remove(str +@@ -2500,9 +2642,9 @@ static int mv643xx_eth_shared_remove(str { struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev); @@ -303,7 +303,7 @@ Signed-off-by: David S. Miller return 0; } -@@ -2513,6 +2655,7 @@ static struct platform_driver mv643xx_et +@@ -2512,6 +2654,7 @@ static struct platform_driver mv643xx_et .driver = { .name = MV643XX_ETH_SHARED_NAME, .owner = THIS_MODULE, @@ -311,7 +311,7 @@ Signed-off-by: David S. Miller }, }; -@@ -2721,6 +2864,8 @@ static int mv643xx_eth_probe(struct plat +@@ -2720,6 +2863,8 @@ static int mv643xx_eth_probe(struct plat if (!IS_ERR(mp->clk)) { clk_prepare_enable(mp->clk); mp->t_clk = clk_get_rate(mp->clk); -- cgit v1.2.3