r8169: the MMIO region of the 8167 stands behin BAR#1

[pandora-kernel.git] / drivers / net / gt96100eth.c

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index 2d24354..2b4db74 100644 (file)
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -699,7 +699,6 @@ static int __init gt96100_probe1(struct pci_dev *pci, int port_num)
        memset(gp, 0, sizeof(*gp)); // clear it
 
        gp->port_num = port_num;
-       gp->io_size = GT96100_ETH_IO_SIZE;
        gp->port_offset = port_num * GT96100_ETH_IO_SIZE;
        gp->phy_addr = phy_addr;
        gp->chip_rev = chip_rev;
@@ -1030,7 +1029,7 @@ gt96100_open(struct net_device *dev)
        }
 
        if ((retval = request_irq(dev->irq, &gt96100_interrupt,
-                                 SA_SHIRQ, dev->name, dev))) {
+                                 IRQF_SHARED, dev->name, dev))) {
                err("unable to get IRQ %d\n", dev->irq);
                return retval;
        }
@@ -1531,7 +1530,7 @@ static void gt96100_cleanup_module(void)
                                + sizeof(gt96100_td_t) * TX_RING_SIZE,
                                gp->rx_ring);
                        free_netdev(gtif->dev);
-                       release_region(gtif->iobase, gp->io_size);
+                       release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
                }
        }
 }