Merge branch 'upstream-fixes' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / arcnet / com20020-pci.c

diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index 979a33df0a8c3d84dc4871188c465871b822b50f..fc256c197cd667286d8f46cf294f82aa0e4c7a1a 100644 (file)
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -177,7 +177,7 @@ static struct pci_driver com20020pci_driver = {
 static int __init com20020pci_init(void)
 {
        BUGLVL(D_NORMAL) printk(VERSION);
-       return pci_module_init(&com20020pci_driver);
+       return pci_register_driver(&com20020pci_driver);
 }
 
 static void __exit com20020pci_cleanup(void)