Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / orinoco_plx.c

diff --git a/drivers/net/wireless/orinoco_plx.c b/drivers/net/wireless/orinoco_plx.c
index 7f006f6241711d0d6ad52e013d976e7284219b70..31162ac25a92fe32d7d4ddfbe26d8a2e961f04f3 100644 (file)
--- a/drivers/net/wireless/orinoco_plx.c
+++ b/drivers/net/wireless/orinoco_plx.c
@@ -351,7 +351,7 @@ MODULE_LICENSE("Dual MPL/GPL");
 static int __init orinoco_plx_init(void)
 {
        printk(KERN_DEBUG "%s\n", version);
-       return pci_module_init(&orinoco_plx_driver);
+       return pci_register_driver(&orinoco_plx_driver);
 }
 
 static void __exit orinoco_plx_exit(void)