diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 13:27:14 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-02-13 13:27:14 +0000 |
| commit | af63cdf87ad76177fb7180e5fb57ec6f949fbb98 (patch) | |
| tree | 3f3c2ff5babca3eacef366a9b794b0ea7e5f945e /target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch | |
| parent | 83d9cec4911b6639c1c2f22cfb943df3e1252a1e (diff) | |
| download | upstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.tar.gz upstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.tar.bz2 upstream-af63cdf87ad76177fb7180e5fb57ec6f949fbb98.zip | |
upgrade 3.13 targets to 3.13.2, refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org
SVN-Revision: 39582
Diffstat (limited to 'target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch')
| -rw-r--r-- | target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch b/target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch index 70b50750a0..409f93afeb 100644 --- a/target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch +++ b/target/linux/sunxi/patches-3.13/192-stmmac-use-platform-data-with-compat.patch @@ -8,8 +8,6 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org> .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) -diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -index 74c7aef..df3fd1c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -26,8 +26,19 @@ @@ -32,7 +30,7 @@ index 74c7aef..df3fd1c 100644 #ifdef CONFIG_OF static int stmmac_probe_config_dt(struct platform_device *pdev, struct plat_stmmacenet_data *plat, -@@ -35,10 +46,18 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, +@@ -35,10 +46,18 @@ static int stmmac_probe_config_dt(struct { struct device_node *np = pdev->dev.of_node; struct stmmac_dma_cfg *dma_cfg; @@ -51,7 +49,7 @@ index 74c7aef..df3fd1c 100644 *mac = of_get_mac_address(np); plat->interface = of_get_phy_mode(np); -@@ -257,16 +276,6 @@ int stmmac_pltfr_restore(struct device *dev) +@@ -257,16 +276,6 @@ static const struct dev_pm_ops stmmac_pl static const struct dev_pm_ops stmmac_pltfr_pm_ops; #endif /* CONFIG_PM */ @@ -68,6 +66,3 @@ index 74c7aef..df3fd1c 100644 struct platform_driver stmmac_pltfr_driver = { .probe = stmmac_pltfr_probe, .remove = stmmac_pltfr_remove, --- -1.8.5.1 - |