hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/net/ethernet/korina.c
....@@ -53,10 +53,10 @@
5353 #include <linux/mii.h>
5454 #include <linux/ethtool.h>
5555 #include <linux/crc32.h>
56
+#include <linux/pgtable.h>
5657
5758 #include <asm/bootinfo.h>
5859 #include <asm/bitops.h>
59
-#include <asm/pgtable.h>
6060 #include <asm/io.h>
6161 #include <asm/dma.h>
6262
....@@ -917,7 +917,7 @@
917917 enable_irq(lp->rx_irq);
918918 }
919919
920
-static void korina_tx_timeout(struct net_device *dev)
920
+static void korina_tx_timeout(struct net_device *dev, unsigned int txqueue)
921921 {
922922 struct korina_private *lp = netdev_priv(dev);
923923
....@@ -1043,7 +1043,7 @@
10431043
10441044 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
10451045 dev->base_addr = r->start;
1046
- lp->eth_regs = ioremap_nocache(r->start, resource_size(r));
1046
+ lp->eth_regs = ioremap(r->start, resource_size(r));
10471047 if (!lp->eth_regs) {
10481048 printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
10491049 rc = -ENXIO;
....@@ -1051,7 +1051,7 @@
10511051 }
10521052
10531053 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
1054
- lp->rx_dma_regs = ioremap_nocache(r->start, resource_size(r));
1054
+ lp->rx_dma_regs = ioremap(r->start, resource_size(r));
10551055 if (!lp->rx_dma_regs) {
10561056 printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
10571057 rc = -ENXIO;
....@@ -1059,7 +1059,7 @@
10591059 }
10601060
10611061 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
1062
- lp->tx_dma_regs = ioremap_nocache(r->start, resource_size(r));
1062
+ lp->tx_dma_regs = ioremap(r->start, resource_size(r));
10631063 if (!lp->tx_dma_regs) {
10641064 printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
10651065 rc = -ENXIO;