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
/
fm2fb.c
diff --git
a/drivers/video/fm2fb.c
b/drivers/video/fm2fb.c
index
9bd2022
..
3adb65d
100644
(file)
--- a/
drivers/video/fm2fb.c
+++ b/
drivers/video/fm2fb.c
@@
-280,7
+280,7
@@
static int __devinit fm2fb_probe(struct zorro_dev *z,
info->pseudo_palette = info->par;
info->par = NULL;
info->fix = fb_fix;
info->pseudo_palette = info->par;
info->par = NULL;
info->fix = fb_fix;
- info->flags = FBINFO_
FLAG_
DEFAULT;
+ info->flags = FBINFO_DEFAULT;
if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
@@
-292,12
+292,18
@@
static int __devinit fm2fb_probe(struct zorro_dev *z,
return 0;
}
return 0;
}
+int __init fm2fb_setup(char *options);
+
int __init fm2fb_init(void)
{
int __init fm2fb_init(void)
{
+ char *option = NULL;
+
+ if (fb_get_options("fm2fb", &option))
+ return -ENODEV;
+ fm2fb_setup(option);
return zorro_register_driver(&fm2fb_driver);
}
return zorro_register_driver(&fm2fb_driver);
}
-int __init fm2fb_setup(char *options)
{
char *this_opt;
{
char *this_opt;
@@
-313,4
+319,5
@@
int __init fm2fb_setup(char *options)
return 0;
}
return 0;
}
+module_init(fm2fb_init);
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");