~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1128,7 +1128,7 @@
1128	1128	return &dev->stats;
1129	1129	}
1130	1130
1131		-static void net_timeout(struct net_device *dev)
	1131	+static void net_timeout(struct net_device *dev, unsigned int txqueue)
1132	1132	{
1133	1133	/* If we get here, some higher level has decided we are broken.
1134	1134	There should really be a "kick me" function call instead. */
..	..	@@ -1844,15 +1844,11 @@
1844	1844	static int __init cs89x0_platform_probe(struct platform_device *pdev)
1845	1845	{
1846	1846	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
1847		- struct net_local *lp;
1848		- struct resource *mem_res;
1849	1847	void __iomem *virt_addr;
1850	1848	int err;
1851	1849
1852	1850	if (!dev)
1853	1851	return -ENOMEM;
1854		-
1855		- lp = netdev_priv(dev);
1856	1852
1857	1853	dev->irq = platform_get_irq(pdev, 0);
1858	1854	if (dev->irq <= 0) {
..	..	@@ -1861,8 +1857,7 @@
1861	1857	goto free;
1862	1858	}
1863	1859
1864		- mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
1865		- virt_addr = devm_ioremap_resource(&pdev->dev, mem_res);
	1860	+ virt_addr = devm_platform_ioremap_resource(pdev, 0);
1866	1861	if (IS_ERR(virt_addr)) {
1867	1862	err = PTR_ERR(virt_addr);
1868	1863	goto free;