Merge branch 'tmp' into upstream

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

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 8f37c98..b885b20 100644 (file)
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1603,7 +1603,7 @@ static int __init epic_init (void)
                version, version2, version3);
 #endif
 
-       return pci_module_init (&epic_driver);
+       return pci_register_driver(&epic_driver);
 }