From ce97f4302c7085939613a8246b1328055d5cdbb2 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Mon, 18 Oct 2004 18:09:29 -0700 Subject: [PATCH] [PATCH] FrameMaster II build fix fm2fb: Trivial fix for the breakage introduced by the addition of fb_get_options(). Signed-off-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/fm2fb.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c index 3adb65df1fac9..cda492a55f612 100644 --- a/drivers/video/fm2fb.c +++ b/drivers/video/fm2fb.c @@ -292,18 +292,7 @@ static int __devinit fm2fb_probe(struct zorro_dev *z, return 0; } -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); -} - +int __init fm2fb_setup(char *options) { char *this_opt; @@ -319,5 +308,15 @@ int __init fm2fb_init(void) 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_LICENSE("GPL"); -- 2.53.0