Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[firefly-linux-kernel-4.4.55.git] / drivers / video / tdfxfb.c

diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 057bdd593800c9c9f3b22fc5066ed7ba6fd20def..71e179ea5f95db581df36b0e544169b2de947436 100644 (file)
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -1342,7 +1342,7 @@ out_err:
 }
 
 #ifndef MODULE
-static void tdfxfb_setup(char *options)
+static void __init tdfxfb_setup(char *options)
 {
        char *this_opt;