Commit 2d9f95f9 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

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: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0ede66f
...@@ -132,7 +132,6 @@ static struct fb_info info; ...@@ -132,7 +132,6 @@ static struct fb_info info;
static struct xxx_par __initdata current_par; static struct xxx_par __initdata current_par;
int xxxfb_init(void); int xxxfb_init(void);
int xxxfb_setup(char*);
/** /**
* xxxfb_open - Optional function. Called when the framebuffer is * xxxfb_open - Optional function. Called when the framebuffer is
...@@ -975,6 +974,21 @@ static struct platform_device xxxfb_device = { ...@@ -975,6 +974,21 @@ static struct platform_device xxxfb_device = {
.name = "xxxfb", .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) static int __init xxxfb_init(void)
{ {
int ret; int ret;
...@@ -1006,21 +1020,6 @@ static void __exit xxxfb_exit(void) ...@@ -1006,21 +1020,6 @@ static void __exit xxxfb_exit(void)
} }
#endif /* CONFIG_PCI */ #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 */
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment