git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
tridentfb.c
diff --git
a/drivers/video/tridentfb.c
b/drivers/video/tridentfb.c
index
9ac2d31
..
14175cd
100644
(file)
--- a/
drivers/video/tridentfb.c
+++ b/
drivers/video/tridentfb.c
@@
-15,7
+15,6
@@
* TGUI acceleration
*/
* TGUI acceleration
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fb.h>
#include <linux/init.h>
@@
-551,7
+550,7
@@
static inline void enable_mmio(void)
#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
/* Return flat panel's maximum x resolution */
#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
/* Return flat panel's maximum x resolution */
-static int __init get_nativex(void)
+static int __
dev
init get_nativex(void)
{
int x,y,tmp;
{
int x,y,tmp;
@@
-658,7
+657,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.
*/
* 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 __
dev
init get_displaytype(void)
{
if (fp)
return DISPLAY_FP;
{
if (fp)
return DISPLAY_FP;
@@
-668,7
+667,7
@@
static unsigned int __init get_displaytype(void)
}
/* Try detecting the video memory size */
}
/* Try detecting the video memory size */
-static unsigned int __init get_memsize(void)
+static unsigned int __
dev
init get_memsize(void)
{
unsigned char tmp, tmp2;
unsigned int k;
{
unsigned char tmp, tmp2;
unsigned int k;