Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 2d9f95f9 authored Jun 01, 2007 by Krzysztof Helt Committed by Linus Torvalds Jun 01, 2007

skeletonfb: fix of xxxfb_setup ifdef



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

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f0ede66f

drivers/video/skeletonfb.c

+15 −16

Original line number	Diff line number	Diff line
		@@ -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_device = {
		.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 */

		/* ------------------------------------------------------------------------- */