aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMatthew Wilcox <willy@parisc-linux.org>2005-10-21 22:36:40 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-21 22:36:40 -0400
commit53f01bba49938f115237fe43a261c31ac13ae5c6 (patch)
treedf2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /drivers/net
parentbdad1f836ab1ca2b18a625222f63f630cfd14e41 (diff)
[PARISC] Convert parisc_device to use struct resource for hpa
Convert pa_dev->hpa from an unsigned long to a struct resource. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Fix up users of ->hpa to use ->hpa.start instead. Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/lasi_82596.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c
index 180e526a2049..a63d8a317d9e 100644
--- a/drivers/net/lasi_82596.c
+++ b/drivers/net/lasi_82596.c
@@ -1528,17 +1528,18 @@ lan_init_chip(struct parisc_device *dev)
1528 1528
1529 if (!dev->irq) { 1529 if (!dev->irq) {
1530 printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n", 1530 printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
1531 __FILE__, dev->hpa); 1531 __FILE__, dev->hpa.start);
1532 return -ENODEV; 1532 return -ENODEV;
1533 } 1533 }
1534 1534
1535 printk(KERN_INFO "Found i82596 at 0x%lx, IRQ %d\n", dev->hpa, dev->irq); 1535 printk(KERN_INFO "Found i82596 at 0x%lx, IRQ %d\n", dev->hpa.start,
1536 dev->irq);
1536 1537
1537 netdevice = alloc_etherdev(0); 1538 netdevice = alloc_etherdev(0);
1538 if (!netdevice) 1539 if (!netdevice)
1539 return -ENOMEM; 1540 return -ENOMEM;
1540 1541
1541 netdevice->base_addr = dev->hpa; 1542 netdevice->base_addr = dev->hpa.start;
1542 netdevice->irq = dev->irq; 1543 netdevice->irq = dev->irq;
1543 1544
1544 retval = i82596_probe(netdevice, &dev->dev); 1545 retval = i82596_probe(netdevice, &dev->dev);