X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=inline;f=drivers%2Fnet%2Firda%2Fdonauboe.c;fp=drivers%2Fnet%2Firda%2Fdonauboe.c;h=3137592d60c01816f3bb03bb0d4bd05227432f99;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=33c07d5275da22b3ff719b6e66d4cb06167172b6;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 33c07d527..3137592d6 100644
--- 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,
-                   IRQF_SHARED | IRQF_DISABLED, dev->name, (void *) self))
+                   SA_SHIRQ | SA_INTERRUPT, dev->name, (void *) self))
     {
       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.irqflags = IRQF_SHARED | IRQF_DISABLED;
+  self->io.irqflags = SA_SHIRQ | SA_INTERRUPT;
 
   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)
 {
-  return pci_register_driver(&donauboe_pci_driver);
+  return pci_module_init(&donauboe_pci_driver);
 }
 
 static void __exit