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
/
vfb.c
diff --git
a/drivers/video/vfb.c
b/drivers/video/vfb.c
index
8b01918
..
a00da53
100644
(file)
--- a/
drivers/video/vfb.c
+++ b/
drivers/video/vfb.c
@@
-496,6
+496,14
@@
int __init vfb_init(void)
{
int ret = 0;
{
int ret = 0;
+#ifndef MODULE
+ char *option = NULL;
+
+ if (fb_get_options("vfb", &option))
+ return -ENODEV;
+ vfb_setup(option);
+#endif
+
if (!vfb_enable)
return -ENXIO;
if (!vfb_enable)
return -ENXIO;
@@
-509,6
+517,8
@@
int __init vfb_init(void)
return ret;
}
return ret;
}
+module_init(vfb_init);
+
#ifdef MODULE
static void __exit vfb_exit(void)
{
#ifdef MODULE
static void __exit vfb_exit(void)
{
@@
-516,7
+526,6
@@
static void __exit vfb_exit(void)
driver_unregister(&vfb_driver);
}
driver_unregister(&vfb_driver);
}
-module_init(vfb_init);
module_exit(vfb_exit);
MODULE_LICENSE("GPL");
module_exit(vfb_exit);
MODULE_LICENSE("GPL");