[PATCH] FrameMaster II build fix (was: Re: Linux 2.6.9-rc2)

[Geert Uytterhoeven <geert@linux-m68k.org>]

On Mon, 13 Sep 2004, Linus Torvalds wrote:
> Summary of changes from v2.6.9-rc1 to v2.6.9-rc2
> ============================================
> 
> Antonino Daplas:
>   o fbdev: Add module_init() and fb_get_options() per driver

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 <geert@linux-m68k.org>

--- 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");

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds