X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Facenic.c;fp=drivers%2Fnet%2Facenic.c;h=b508812e97acc2bb0d632b0a49bb5f120a0439a6;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=1c01e9b3d07c88cd2856232d268736ac77d87adc;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 1c01e9b3d..b508812e9 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -50,6 +50,7 @@
  *   Grant Grundler <grundler@cup.hp.com>: PCI write posting fixes.
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/version.h>
@@ -578,7 +579,11 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
 	}
 
 	printk("Gigabit Ethernet at 0x%08lx, ", dev->base_addr);
-	printk("irq %d\n", pdev->irq);
+#ifdef __sparc__
+	printk("irq %s\n", __irq_itoa(pdev->irq));
+#else
+	printk("irq %i\n", pdev->irq);
+#endif
 
 #ifdef CONFIG_ACENIC_OMIT_TIGON_I
 	if ((readl(&ap->regs->HostCtrl) >> 28) == 4) {
@@ -1194,7 +1199,7 @@ static int __devinit ace_init(struct net_device *dev)
 		goto init_error;
 	}
 
-	ecode = request_irq(pdev->irq, ace_interrupt, IRQF_SHARED,
+	ecode = request_irq(pdev->irq, ace_interrupt, SA_SHIRQ,
 			    DRV_NAME, dev);
 	if (ecode) {
 		printk(KERN_WARNING "%s: Requested IRQ %d is busy\n",