Merge branch 'tmp' into upstream

[pandora-kernel.git] / drivers / net / yellowfin.c

diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index cdc98ff..8746cc7 100644 (file)
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -1432,7 +1432,7 @@ static int __init yellowfin_init (void)
 #ifdef MODULE
        printk(version);
 #endif
-       return pci_module_init (&yellowfin_driver);
+       return pci_register_driver(&yellowfin_driver);
 }