Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / 3c359.c

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 77bb298129d7caa057a18198457caaef1468d997..412390ba142ecff7b14ba41f773403bda4ba6575 100644 (file)
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -576,7 +576,7 @@ static int xl_open(struct net_device *dev)
 
        u16 switchsettings, switchsettings_eeprom  ;
  
-       if(request_irq(dev->irq, &xl_interrupt, SA_SHIRQ , "3c359", dev)) {
+       if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) {
                return -EAGAIN;
        }
 
@@ -1815,7 +1815,7 @@ static struct pci_driver xl_3c359_driver = {
 
 static int __init xl_pci_init (void)
 {
-       return pci_module_init (&xl_3c359_driver);
+       return pci_register_driver(&xl_3c359_driver);
 }