Merge branch 'upstream-fixes' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / defxx.c

diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c
index 5acd35c312acb0734b91fc9a6983224a7f517e78..7d06dedbfb26f2fd0f6b9576ea00ca3215935736 100644 (file)
--- a/drivers/net/defxx.c
+++ b/drivers/net/defxx.c
@@ -1228,7 +1228,7 @@ static int dfx_open(struct net_device *dev)
        
        /* Register IRQ - support shared interrupts by passing device ptr */
 
-       ret = request_irq(dev->irq, dfx_interrupt, SA_SHIRQ, dev->name, dev);
+       ret = request_irq(dev->irq, dfx_interrupt, IRQF_SHARED, dev->name, dev);
        if (ret) {
                printk(KERN_ERR "%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
                return ret;
@@ -3444,7 +3444,7 @@ static int __init dfx_init(void)
 {
        int rc_pci, rc_eisa;
 
-       rc_pci = pci_module_init(&dfx_driver);
+       rc_pci = pci_register_driver(&dfx_driver);
        if (rc_pci >= 0) dfx_have_pci = 1;
        
        rc_eisa = dfx_eisa_init();