---

yaml
---
r: 29759
b: refs/heads/master
c: 474ab45
h: refs/heads/master
i:
  29757: f106068
  29755: c24e5cb
  29751: c25f94e
  29743: e7d0f14
  29727: 86af5e0
  29695: 149aa9b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ebb92840b6bbb2e2fd8ad6b2b55d9cd76a06a0
+refs/heads/master: 474ab45a1f7de888df63da86b46785fe19d7fbe7

trunk/drivers/video/tridentfb.c

@@ -551,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 __init get_nativex(void)
+static int __devinit get_nativex(void)
 {
 	int x,y,tmp;
 
@@ -658,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 __init get_displaytype(void)
+static unsigned int __devinit get_displaytype(void)
 {
 	if (fp)
 		return DISPLAY_FP;
@@ -668,7 +668,7 @@ static unsigned int __init get_displaytype(void)
 }
 
 /* Try detecting the video memory size */
-static unsigned int __init get_memsize(void)
+static unsigned int __devinit get_memsize(void)
 {
 	unsigned char tmp, tmp2;
 	unsigned int k;