Merge branch 'upstream-fixes' into upstream

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

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8b53ded..39460fa 100644 (file)
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1725,7 +1725,7 @@ static struct pci_driver tc35815_driver = {
 
 static int __init tc35815_init_module(void)
 {
-       return pci_module_init(&tc35815_driver);
+       return pci_register_driver(&tc35815_driver);
 }
 
 static void __exit tc35815_cleanup_module(void)