diff --git a/[refs] b/[refs]
index f491b9056f8c..b5c2ef595e77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74f482cca5f76643e7f323e66cc38b1a882d5e6f
+refs/heads/master: 0ce85eb8824679cd9e7b3b12202e2bf54f1f3e2c
diff --git a/trunk/drivers/video/tdfxfb.c b/trunk/drivers/video/tdfxfb.c
index 057bdd593800..71e179ea5f95 100644
--- a/trunk/drivers/video/tdfxfb.c
+++ b/trunk/drivers/video/tdfxfb.c
@@ -1342,7 +1342,7 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
 }
 
 #ifndef MODULE
-static void tdfxfb_setup(char *options)
+static void __init tdfxfb_setup(char *options)
 {
 	char *this_opt;