Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib…

…' and 'srp' into for-next
git-mirror · Feb 26, 2013 · ef4e359 · ef4e359
8 parents 6b52a12 + b23523d + f72dd56 + 5525d21 + 8ab10f7 + b425388 + bcc9b67 + 2ce19e7
commit ef4e359
Show file tree

Hide file tree

Showing 30 changed files with 625 additions and 210 deletions.
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
@@ -1238,15 +1238,4 @@ static struct pci_driver c2_pci_driver = {
 	.remove = c2_remove,
 };
 
-static int __init c2_init_module(void)
-{
-	return pci_register_driver(&c2_pci_driver);
-}
-
-static void __exit c2_exit_module(void)
-{
-	pci_unregister_driver(&c2_pci_driver);
-}
-
-module_init(c2_init_module);
-module_exit(c2_exit_module);
+module_pci_driver(c2_pci_driver);