From 606f6106102bb743c282e7f29c2caa46dd84a175 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 25 Jun 2006 05:48:38 -0700
Subject: [PATCH] --- yaml --- r: 29759 b: refs/heads/master c:
 474ab45a1f7de888df63da86b46785fe19d7fbe7 h: refs/heads/master i:   29757:
 f10606806653ac57c368eb285ac0c5334ab674ae   29755:
 c24e5cbcdbb6aa91a70f5cb3a6a58ea8d6209a16   29751:
 c25f94e6236bda09b3b037f3f2e41ab6e21193d2   29743:
 e7d0f1487b80732c4e5923726e5de3734360d087   29727:
 86af5e0572061b3cfad0733b28224ec0c00be356   29695:
 149aa9be835531498eef25ba8c84ae31c72b5258 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/video/tridentfb.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8a1ea1355143..e1ef5b3e45c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ebb92840b6bbb2e2fd8ad6b2b55d9cd76a06a0
+refs/heads/master: 474ab45a1f7de888df63da86b46785fe19d7fbe7
diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c
index 9ac2d3171187..41f8c2d93892 100644
--- a/trunk/drivers/video/tridentfb.c
+++ b/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;