Commit 7bae2dad authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] tridentfb warning fix

drivers/video/tridentfb.c:1219: warning: `tridentfb_setup' declared `static' but never defined
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 747525de
...@@ -1216,27 +1216,6 @@ static struct pci_driver tridentfb_pci_driver = { ...@@ -1216,27 +1216,6 @@ static struct pci_driver tridentfb_pci_driver = {
.remove = __devexit_p(trident_pci_remove) .remove = __devexit_p(trident_pci_remove)
}; };
static int tridentfb_setup(char *options);
static int __init tridentfb_init(void)
{
#ifndef MODULE
char *option = NULL;
if (fb_get_options("tridentfb", &option))
return -ENODEV;
tridentfb_setup(option);
#endif
output("Trident framebuffer %s initializing\n", VERSION);
return pci_module_init(&tridentfb_pci_driver);
}
static void __exit tridentfb_exit(void)
{
pci_unregister_driver(&tridentfb_pci_driver);
}
/* /*
* Parse user specified options (`video=trident:') * Parse user specified options (`video=trident:')
* example: * example:
...@@ -1275,6 +1254,24 @@ static int tridentfb_setup(char *options) ...@@ -1275,6 +1254,24 @@ static int tridentfb_setup(char *options)
} }
#endif #endif
static int __init tridentfb_init(void)
{
#ifndef MODULE
char *option = NULL;
if (fb_get_options("tridentfb", &option))
return -ENODEV;
tridentfb_setup(option);
#endif
output("Trident framebuffer %s initializing\n", VERSION);
return pci_module_init(&tridentfb_pci_driver);
}
static void __exit tridentfb_exit(void)
{
pci_unregister_driver(&tridentfb_pci_driver);
}
static struct fb_ops tridentfb_ops = { static struct fb_ops tridentfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.fb_setcolreg = tridentfb_setcolreg, .fb_setcolreg = tridentfb_setcolreg,
......
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