To: linus, akpm Cc: lkml Subject: [PATCH] FrameMaster II build fix fm2fb: Trivial fix for the breakage introduced by the addition of fb_get_options() in 2.6.9-rc2. Signed-off-by: Geert Uytterhoeven --- fm2fb.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) --- linux-2.6.9-rc4/drivers/video/fm2fb.c 2004-09-30 12:53:50.000000000 +0200 +++ linux-m68k-2.6.9-rc4/drivers/video/fm2fb.c 2004-10-11 23:06:38.000000000 +0200 @@ -292,18 +292,7 @@ static int __devinit fm2fb_probe(struct 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");