[PATCH] skeletonfb: fix of xxxfb_setup ifdef

From
Krzysztof Helt <hidden>
Date
2007-05-19 17:05:36
From: Krzysztof Helt <redacted>

This patch fixes wrong ifdef around the xxxfb_setup. It also moves this function to remove forward declaration.

Signed-off-by: Krzysztof Helt <redacted>

---

Diff-ed agains 2.6.22-rc2

diff -urp linux-2.6.21/drivers/video/skeletonfb.c linux-2.6.21.new/drivers/video/skeletonfb.c
--- linux-2.6.21/drivers/video/skeletonfb.c	2007-05-20 18:45:05.907358455 +0200
+++ linux-2.6.21.new/drivers/video/skeletonfb.c	2007-05-20 18:37:48.054406637 +0200
@@ -132,7 +132,6 @@ static struct fb_info info;
 static struct xxx_par __initdata current_par;

 int xxxfb_init(void);
-int xxxfb_setup(char*);

 /**
  *	xxxfb_open - Optional function. Called when the framebuffer is
@@ -975,6 +974,21 @@ static struct platform_device xxxfb_devi
 	.name = "xxxfb",
 };

+#ifndef MODULE
+    /*
+     *  Setup
+     */
+
+/*
+ * Only necessary if your driver takes special options,
+ * otherwise we fall back on the generic fb_setup().
+ */
+int __init xxxfb_setup(char *options)
+{
+    /* Parse user speficied options (`video=xxxfb:') */
+}
+#endif /* MODULE */
+
 static int __init xxxfb_init(void)
 {
 	int ret;
@@ -1006,21 +1020,6 @@ static void __exit xxxfb_exit(void)
 }
 #endif /* CONFIG_PCI */

-#ifdef MODULE
-    /*
-     *  Setup
-     */
-
-/*
- * Only necessary if your driver takes special options,
- * otherwise we fall back on the generic fb_setup().
- */
-int __init xxxfb_setup(char *options)
-{
-    /* Parse user speficied options (`video=xxxfb:') */
-}
-#endif /* MODULE */
-
 /* ------------------------------------------------------------------------- */


Attachments

Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help