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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
video
/
matrox
/
matroxfb_base.c
diff --git
a/drivers/video/matrox/matroxfb_base.c
b/drivers/video/matrox/matroxfb_base.c
index
8074e85
..
e2a2290
100644
(file)
--- a/
drivers/video/matrox/matroxfb_base.c
+++ b/
drivers/video/matrox/matroxfb_base.c
@@
-2415,8
+2415,14
@@
static int __initdata initialized = 0;
int __init matroxfb_init(void)
{
int __init matroxfb_init(void)
{
+ char *option = NULL;
+
DBG(__FUNCTION__)
DBG(__FUNCTION__)
+ if (fb_get_options("matroxfb", &option))
+ return -ENODEV;
+ matroxfb_setup(option);
+
if (disabled)
return -ENXIO;
if (!initialized) {
if (disabled)
return -ENXIO;
if (!initialized) {
@@
-2428,6
+2434,8
@@
int __init matroxfb_init(void)
return 0;
}
return 0;
}
+module_init(matroxfb_init);
+
#else
/* *************************** init module code **************************** */
#else
/* *************************** init module code **************************** */