Merge with 2.3.19.

1 files changed, 22 insertions, 22 deletions

diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index 36a841c08..ae8a4fbdc 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -126,21 +126,21 @@ bad_clone_list[] __initdata = {
 /* Non-zero only if the current card is a PCI with BIOS-set IRQ. */
 static unsigned int pci_irq_line = 0;
 
-int ne_probe(struct device *dev);
-static int ne_probe1(struct device *dev, int ioaddr);
+int ne_probe(struct net_device *dev);
+static int ne_probe1(struct net_device *dev, int ioaddr);
 #ifdef CONFIG_PCI
-static int ne_probe_pci(struct device *dev);
+static int ne_probe_pci(struct net_device *dev);
 #endif
 
-static int ne_open(struct device *dev);
-static int ne_close(struct device *dev);
+static int ne_open(struct net_device *dev);
+static int ne_close(struct net_device *dev);
 
-static void ne_reset_8390(struct device *dev);
-static void ne_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr,
+static void ne_reset_8390(struct net_device *dev);
+static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
 			  int ring_page);
-static void ne_block_input(struct device *dev, int count,
+static void ne_block_input(struct net_device *dev, int count,
 			  struct sk_buff *skb, int ring_offset);
-static void ne_block_output(struct device *dev, const int count,
+static void ne_block_output(struct net_device *dev, const int count,
 		const unsigned char *buf, const int start_page);
 
 
@@ -177,7 +177,7 @@ struct netdev_entry netcard_drv =
  * the card.
  */
 
-int __init ne_probe(struct device *dev)
+int __init ne_probe(struct net_device *dev)
 {
 	int base_addr = dev ? dev->base_addr : 0;
 
@@ -209,7 +209,7 @@ int __init ne_probe(struct device *dev)
 #endif
 
 #ifdef CONFIG_PCI
-static int __init ne_probe_pci(struct device *dev)
+static int __init ne_probe_pci(struct net_device *dev)
 {
 	int i;
 
@@ -218,7 +218,7 @@ static int __init ne_probe_pci(struct device *dev)
 		unsigned int pci_ioaddr;
 
 		while ((pdev = pci_find_device(pci_clone_list[i].vendor, pci_clone_list[i].dev_id, pdev))) {
-			pci_ioaddr = pdev->base_address[0] & PCI_BASE_ADDRESS_IO_MASK;
+			pci_ioaddr = pdev->resource[0].start;
 			/* Avoid already found cards from previous calls */
 			if (check_region(pci_ioaddr, NE_IO_EXTENT))
 				continue;
@@ -243,7 +243,7 @@ static int __init ne_probe_pci(struct device *dev)
 }
 #endif  /* CONFIG_PCI */
 
-static int __init ne_probe1(struct device *dev, int ioaddr)
+static int __init ne_probe1(struct net_device *dev, int ioaddr)
 {
 	int i;
 	unsigned char SA_prom[32];
@@ -497,14 +497,14 @@ static int __init ne_probe1(struct device *dev, int ioaddr)
 	return 0;
 }
 
-static int ne_open(struct device *dev)
+static int ne_open(struct net_device *dev)
 {
 	ei_open(dev);
 	MOD_INC_USE_COUNT;
 	return 0;
 }
 
-static int ne_close(struct device *dev)
+static int ne_close(struct net_device *dev)
 {
 	if (ei_debug > 1)
 		printk(KERN_DEBUG "%s: Shutting down ethercard.\n", dev->name);
@@ -516,7 +516,7 @@ static int ne_close(struct device *dev)
 /* Hard reset the card.  This used to pause for the same period that a
    8390 reset command required, but that shouldn't be necessary. */
 
-static void ne_reset_8390(struct device *dev)
+static void ne_reset_8390(struct net_device *dev)
 {
 	unsigned long reset_start_time = jiffies;
 
@@ -542,7 +542,7 @@ static void ne_reset_8390(struct device *dev)
    we don't need to be concerned with ring wrap as the header will be at
    the start of a page, so we optimize accordingly. */
 
-static void ne_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
+static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
 {
 	int nic_base = dev->base_addr;
 
@@ -579,7 +579,7 @@ static void ne_get_8390_hdr(struct device *dev, struct e8390_pkt_hdr *hdr, int r
    The NEx000 doesn't share the on-board packet memory -- you have to put
    the packet out through the "remote DMA" dataport using outb. */
 
-static void ne_block_input(struct device *dev, int count, struct sk_buff *skb, int ring_offset)
+static void ne_block_input(struct net_device *dev, int count, struct sk_buff *skb, int ring_offset)
 {
 #ifdef NE_SANITY_CHECK
 	int xfer_count = count;
@@ -646,7 +646,7 @@ static void ne_block_input(struct device *dev, int count, struct sk_buff *skb, i
 	ei_status.dmaing &= ~0x01;
 }
 
-static void ne_block_output(struct device *dev, int count,
+static void ne_block_output(struct net_device *dev, int count,
 		const unsigned char *buf, const int start_page)
 {
 	int nic_base = NE_BASE;
@@ -756,7 +756,7 @@ retry:
 #define MAX_NE_CARDS	4	/* Max number of NE cards per module */
 #define NAMELEN		8	/* # of chars for storing dev->name */
 static char namelist[NAMELEN * MAX_NE_CARDS] = { 0, };
-static struct device dev_ne[MAX_NE_CARDS] = {
+static struct net_device dev_ne[MAX_NE_CARDS] = {
 	{
 		NULL,		/* assign a chunk of namelist[] below */
 		0, 0, 0, 0,
@@ -787,7 +787,7 @@ int init_module(void)
 	int this_dev, found = 0;
 
 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-		struct device *dev = &dev_ne[this_dev];
+		struct net_device *dev = &dev_ne[this_dev];
 		dev->name = namelist+(NAMELEN*this_dev);
 		dev->irq = irq[this_dev];
 		dev->mem_end = bad[this_dev];
@@ -816,7 +816,7 @@ void cleanup_module(void)
 	int this_dev;
 
 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-		struct device *dev = &dev_ne[this_dev];
+		struct net_device *dev = &dev_ne[this_dev];
 		if (dev->priv != NULL) {
 			void *priv = dev->priv;
 			free_irq(dev->irq, dev);