diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-11-05 08:25:45 +0000 |
| commit | 35656042f1cd457819a75c980613634b494a7e70 (patch) | |
| tree | f7999960f435d3eeacf3bc222cf249f3df368969 /target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch | |
| parent | cb07269988cd3be7cbbd3278081c5688ae8d7616 (diff) | |
| download | upstream-35656042f1cd457819a75c980613634b494a7e70.tar.gz upstream-35656042f1cd457819a75c980613634b494a7e70.tar.bz2 upstream-35656042f1cd457819a75c980613634b494a7e70.zip | |
kernel: update 3.10 to 3.10.18
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38652
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch')
| -rw-r--r-- | target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch index caf4d10850..a7c5628482 100644 --- a/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch +++ b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch @@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c -@@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(stru +@@ -2469,7 +2469,7 @@ static int mv643xx_eth_shared_probe(stru if (msp == NULL) return -ENOMEM; @@ -23,7 +23,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (msp->base == NULL) return -ENOMEM; -@@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(str +@@ -2497,7 +2497,6 @@ static int mv643xx_eth_shared_remove(str { struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev); |