diff --git a/[refs] b/[refs]
index 0187bf45a1fe..f5bec9ef6900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2686de27a356914e098329463d5a8cd7aa6f29a4
+refs/heads/master: f58f8313a6f552d1e7889926a29f0cf91c02f55d
diff --git a/trunk/drivers/scsi/qla1280.c b/trunk/drivers/scsi/qla1280.c
index 680f6063954b..f09d54058ce1 100644
--- a/trunk/drivers/scsi/qla1280.c
+++ b/trunk/drivers/scsi/qla1280.c
@@ -4210,7 +4210,7 @@ qla1280_setup(char *s)
 }
 
 
-static int
+static int __init
 qla1280_get_token(char *str)
 {
 	char *sep;