drivers/net: Remove deprecated use of pci_module_init()

[linux-2.6] / drivers / net / amd8111e.c

diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
old mode 100755 (executable)
new mode 100644 (file)
index 8618012..2ef8e55
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -69,7 +69,6 @@ Revision History:
 */
 
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -1290,7 +1289,7 @@ static irqreturn_t amd8111e_interrupt(int irq, void *dev_id, struct pt_regs *reg
        writel(intr0, mmio + INT0);
 
        /* Check if Receive Interrupt has occurred. */
-#if CONFIG_AMD8111E_NAPI
+#ifdef CONFIG_AMD8111E_NAPI
        if(intr0 & RINT0){
                if(netif_rx_schedule_prep(dev)){
                        /* Disable receive interupts */
@@ -1377,7 +1376,7 @@ static int amd8111e_open(struct net_device * dev )
 {
        struct amd8111e_priv *lp = netdev_priv(dev);
 
-       if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt, SA_SHIRQ,
+       if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt, IRQF_SHARED,
                                         dev->name, dev)) 
                return -EAGAIN;
 
@@ -2159,7 +2158,7 @@ static struct pci_driver amd8111e_driver = {
 
 static int __init amd8111e_init(void)
 {
-       return pci_module_init(&amd8111e_driver);
+       return pci_register_driver(&amd8111e_driver);
 }
 
 static void __exit amd8111e_cleanup(void)