diff --git a/[refs] b/[refs]
index e3db12fa47a2..04b792a320b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09a4a112559f4e93bb07d9683972e9064ae0418f
+refs/heads/master: ca26200511776a0b54c5c832efde48ee6445a738
diff --git a/trunk/drivers/char/isicom.c b/trunk/drivers/char/isicom.c
index adaf833c5431..a56491eb8978 100644
--- a/trunk/drivers/char/isicom.c
+++ b/trunk/drivers/char/isicom.c
@@ -1861,7 +1861,7 @@ static void __devexit isicom_remove(struct pci_dev *pdev)
 	release_region(board->base, 16);
 }
 
-static int __devinit isicom_setup(void)
+static int __init isicom_init(void)
 {
 	int retval, idx, channel;
 	struct isi_port *port;
@@ -1965,7 +1965,7 @@ static void __exit isicom_exit(void)
 	put_tty_driver(isicom_normal);
 }
 
-module_init(isicom_setup);
+module_init(isicom_init);
 module_exit(isicom_exit);
 
 MODULE_AUTHOR("MultiTech");