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
/
vga16fb.c
diff --git
a/drivers/video/vga16fb.c
b/drivers/video/vga16fb.c
index
770681c
..
2e132fb
100644
(file)
--- a/
drivers/video/vga16fb.c
+++ b/
drivers/video/vga16fb.c
@@
-1342,7
+1342,14
@@
int __init vga16fb_init(void)
{
int i;
int ret;
{
int i;
int ret;
+#ifndef MODULE
+ char *option = NULL;
+ if (fb_get_options("vga16fb", &option))
+ return -ENODEV;
+
+ vga16fb_setup(option);
+#endif
printk(KERN_DEBUG "vga16fb: initializing\n");
/* XXX share VGA_FB_PHYS and I/O region with vgacon and others */
printk(KERN_DEBUG "vga16fb: initializing\n");
/* XXX share VGA_FB_PHYS and I/O region with vgacon and others */
@@
-1418,8
+1425,8
@@
static void __exit vga16fb_exit(void)
#ifdef MODULE
MODULE_LICENSE("GPL");
#ifdef MODULE
MODULE_LICENSE("GPL");
-module_init(vga16fb_init);
#endif
#endif
+module_init(vga16fb_init);
module_exit(vga16fb_exit);
module_exit(vga16fb_exit);