linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / net / irda / donauboe.c

diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 33c07d5..3137592 100644 (file)
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1372,7 +1372,7 @@ toshoboe_net_open (struct net_device *dev)
     return 0;
 
   if (request_irq (self->io.irq, toshoboe_interrupt,
     return 0;
 
   if (request_irq (self->io.irq, toshoboe_interrupt,

-                   IRQF_SHARED | IRQF_DISABLED, dev->name, (void *) self))
+                   SA_SHIRQ | SA_INTERRUPT, dev->name, (void *) self))

     {
       return -EAGAIN;
     }
     {
       return -EAGAIN;
     }


@@ -1573,7 +1573,7 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid)
   self->io.fir_base = self->base;
   self->io.fir_ext = OBOE_IO_EXTENT;
   self->io.irq = pci_dev->irq;
   self->io.fir_base = self->base;
   self->io.fir_ext = OBOE_IO_EXTENT;
   self->io.irq = pci_dev->irq;

-  self->io.irqflags = IRQF_SHARED | IRQF_DISABLED;
+  self->io.irqflags = SA_SHIRQ | SA_INTERRUPT;

 
   self->speed = self->io.speed = 9600;
   self->async = 0;
 
   self->speed = self->io.speed = 9600;
   self->async = 0;


@@ -1778,7 +1778,7 @@ static struct pci_driver donauboe_pci_driver = {
 static int __init
 donauboe_init (void)
 {
 static int __init
 donauboe_init (void)
 {

-  return pci_register_driver(&donauboe_pci_driver);
+  return pci_module_init(&donauboe_pci_driver);

 }
 
 static void __exit
 }
 
 static void __exit