Merge branch 'master' into upstream

[~andy/linux] / drivers / net / saa9730.c

diff --git a/drivers/net/saa9730.c b/drivers/net/saa9730.c
index b2acedbefa8ffb2b63413e1d097ce29c8ca085c2..c479b07be788a129b4bac08abf19a141d8e2f945 100644 (file)
--- a/drivers/net/saa9730.c
+++ b/drivers/net/saa9730.c
@@ -1131,7 +1131,7 @@ static struct pci_driver saa9730_driver = {
 
 static int __init saa9730_init(void)
 {
-       return pci_module_init(&saa9730_driver);
+       return pci_register_driver(&saa9730_driver);
 }
 
 static void __exit saa9730_cleanup(void)