X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Ftridentfb.c;fp=drivers%2Fvideo%2Ftridentfb.c;h=9ac2d3171187855286c7869e1ea33f5f0c7cebe2;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=14175cdb9c9c837ab097e915c7415cf3d1ae0b8d;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 14175cdb9..9ac2d3171 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -15,6 +15,7 @@
  *	TGUI acceleration	
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/fb.h>
 #include <linux/init.h>
@@ -550,7 +551,7 @@ static inline void enable_mmio(void)
 #define crtc_unlock()	write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
 
 /*  Return flat panel's maximum x resolution */
-static int __devinit get_nativex(void)
+static int __init get_nativex(void)
 {
 	int x,y,tmp;
 
@@ -657,7 +658,7 @@ static void set_number_of_lines(int lines)
  * If we see that FP is active we assume we have one.
  * Otherwise we have a CRT display.User can override.
  */
-static unsigned int __devinit get_displaytype(void)
+static unsigned int __init get_displaytype(void)
 {
 	if (fp)
 		return DISPLAY_FP;
@@ -667,7 +668,7 @@ static unsigned int __devinit get_displaytype(void)
 }
 
 /* Try detecting the video memory size */
-static unsigned int __devinit get_memsize(void)
+static unsigned int __init get_memsize(void)
 {
 	unsigned char tmp, tmp2;
 	unsigned int k;