linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / ieee1394 / pcilynx.c

diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
index e6f4123..e2edc41 100644 (file)
--- a/drivers/ieee1394/pcilynx.c
+++ b/drivers/ieee1394/pcilynx.c
@@ -30,6 +30,7 @@
  *        Enhancements in async and iso send code
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
@@ -1251,9 +1252,13 @@ static int __devinit add_card(struct pci_dev *dev,
         /* Fix buggy cards with autoboot pin not tied low: */
         reg_write(lynx, DMA0_CHAN_CTRL, 0);
 
+#ifndef __sparc__
        sprintf (irq_buf, "%d", dev->irq);
+#else
+       sprintf (irq_buf, "%s", __irq_itoa(dev->irq));
+#endif
 
-        if (!request_irq(dev->irq, lynx_irq_handler, IRQF_SHARED,
+        if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ,
                          PCILYNX_DRIVER_NAME, lynx)) {
                 PRINT(KERN_INFO, lynx->id, "allocated interrupt %s", irq_buf);
                 lynx->state = have_intr;