diff --git a/[refs] b/[refs]
index cd6806c9ed8a..72850907c025 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbd9f9ee69242f23c6063f0102bbb98f5bd23521
+refs/heads/master: 680d86699d17622bf2dd1bdd9f6d2520af1b142d
diff --git a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
index df09b1cb742f..3a17dcc3e910 100644
--- a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3953,15 +3953,4 @@ static struct pci_driver ql3xxx_driver = {
 	.remove = __devexit_p(ql3xxx_remove),
 };
 
-static int __init ql3xxx_init_module(void)
-{
-	return pci_register_driver(&ql3xxx_driver);
-}
-
-static void __exit ql3xxx_exit(void)
-{
-	pci_unregister_driver(&ql3xxx_driver);
-}
-
-module_init(ql3xxx_init_module);
-module_exit(ql3xxx_exit);
+module_pci_driver(ql3xxx_driver);