Commit ce97f430 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] FrameMaster II build fix

fm2fb: Trivial fix for the breakage introduced by the addition of
fb_get_options().
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 77e0f282
...@@ -292,18 +292,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z, ...@@ -292,18 +292,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z,
return 0; return 0;
} }
int __init fm2fb_setup(char *options); int __init fm2fb_setup(char *options)
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);
}
{ {
char *this_opt; char *this_opt;
...@@ -319,5 +308,15 @@ int __init fm2fb_init(void) ...@@ -319,5 +308,15 @@ int __init fm2fb_init(void)
return 0; return 0;
} }
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);
}
module_init(fm2fb_init); module_init(fm2fb_init);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment