mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/net/ethernet/korina.c
..
..
@@ -53,10 +53,10 @@
53
53
 #include <linux/mii.h>
54
54
 #include <linux/ethtool.h>
55
55
 #include <linux/crc32.h>
56
+#include <linux/pgtable.h>
56
57
 
57
58
 #include <asm/bootinfo.h>
58
59
 #include <asm/bitops.h>
59
-#include <asm/pgtable.h>
60
60
 #include <asm/io.h>
61
61
 #include <asm/dma.h>
62
62
 
..
..
@@ -917,7 +917,7 @@
917
917
 	enable_irq(lp->rx_irq);
918
918
 }
919
919
 
920
-static void korina_tx_timeout(struct net_device *dev)
920
+static void korina_tx_timeout(struct net_device *dev, unsigned int txqueue)
921
921
 {
922
922
 	struct korina_private *lp = netdev_priv(dev);
923
923
 
..
..
@@ -1043,7 +1043,7 @@
1043
1043
 
1044
1044
 	r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
1045
1045
 	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));
1047
1047
 	if (!lp->eth_regs) {
1048
1048
 		printk(KERN_ERR DRV_NAME ": cannot remap registers\n");
1049
1049
 		rc = -ENXIO;
..
..
@@ -1051,7 +1051,7 @@
1051
1051
 	}
1052
1052
 
1053
1053
 	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));
1055
1055
 	if (!lp->rx_dma_regs) {
1056
1056
 		printk(KERN_ERR DRV_NAME ": cannot remap Rx DMA registers\n");
1057
1057
 		rc = -ENXIO;
..
..
@@ -1059,7 +1059,7 @@
1059
1059
 	}
1060
1060
 
1061
1061
 	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));
1063
1063
 	if (!lp->tx_dma_regs) {
1064
1064
 		printk(KERN_ERR DRV_NAME ": cannot remap Tx DMA registers\n");
1065
1065
 		rc = -ENXIO;