Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / qlge / qlge_main.c

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 0a0e50f..ef8037d 100644 (file)
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -4262,7 +4262,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)
        return status;
 }
 
-static void qlge_tx_timeout(struct net_device *ndev)
+static void qlge_tx_timeout(struct net_device *ndev, unsigned int txqueue)
 {
        struct ql_adapter *qdev = netdev_priv(ndev);
        ql_queue_asic_error(qdev);
@@ -4443,7 +4443,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
        pdev->needs_freset = 1;
        pci_save_state(pdev);
        qdev->reg_base =
-           ioremap_nocache(pci_resource_start(pdev, 1),
+           ioremap(pci_resource_start(pdev, 1),
                            pci_resource_len(pdev, 1));
        if (!qdev->reg_base) {
                dev_err(&pdev->dev, "Register mapping failed.\n");
@@ -4453,7 +4453,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
 
        qdev->doorbell_area_size = pci_resource_len(pdev, 3);
        qdev->doorbell_area =
-           ioremap_nocache(pci_resource_start(pdev, 3),
+           ioremap(pci_resource_start(pdev, 3),
                            pci_resource_len(pdev, 3));
        if (!qdev->doorbell_area) {
                dev_err(&pdev->dev, "Doorbell register mapping failed.\n");