aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/atm/firestream.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/atm/firestream.c')
-rw-r--r--drivers/atm/firestream.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 1bca86edf570..38fc054bd671 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1658,9 +1658,10 @@ static int __devinit fs_init (struct fs_dev *dev)
1658 func_enter (); 1658 func_enter ();
1659 pci_dev = dev->pci_dev; 1659 pci_dev = dev->pci_dev;
1660 1660
1661 printk (KERN_INFO "found a FireStream %d card, base %08lx, irq%d.\n", 1661 printk (KERN_INFO "found a FireStream %d card, base %16llx, irq%d.\n",
1662 IS_FS50(dev)?50:155, 1662 IS_FS50(dev)?50:155,
1663 pci_resource_start(pci_dev, 0), dev->pci_dev->irq); 1663 (unsigned long long)pci_resource_start(pci_dev, 0),
1664 dev->pci_dev->irq);
1664 1665
1665 if (fs_debug & FS_DEBUG_INIT) 1666 if (fs_debug & FS_DEBUG_INIT)
1666 my_hd ((unsigned char *) dev, sizeof (*dev)); 1667 my_hd ((unsigned char *) dev, sizeof (*dev));
@@ -1828,7 +1829,7 @@ static int __devinit fs_init (struct fs_dev *dev)
1828 init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1); 1829 init_q (dev, &dev->rx_rq[i], RXB_RQ(i), RXRQ_NENTRIES, 1);
1829 1830
1830 dev->irq = pci_dev->irq; 1831 dev->irq = pci_dev->irq;
1831 if (request_irq (dev->irq, fs_irq, SA_SHIRQ, "firestream", dev)) { 1832 if (request_irq (dev->irq, fs_irq, IRQF_SHARED, "firestream", dev)) {
1832 printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq); 1833 printk (KERN_WARNING "couldn't get irq %d for firestream.\n", pci_dev->irq);
1833 /* XXX undo all previous stuff... */ 1834 /* XXX undo all previous stuff... */
1834 return 1; 1835 return 1;