提交 328f55ba 编写于 作者: J Javier Martinez Canillas 提交者: Greg Kroah-Hartman

staging : xgifb: Removes compilation conditionals

This patch fixes a compilation warning in today linux-next
removing some compilation conditionals.
Signed-off-by: NJavier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 b6c78757
...@@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void) ...@@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void)
} }
#ifndef MODULE
XGIINITSTATIC int __init XGIfb_setup(char *options) XGIINITSTATIC int __init XGIfb_setup(char *options)
{ {
char *this_opt; char *this_opt;
...@@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options) ...@@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
printk("\nxgifb: outa xgifb_setup 3450"); printk("\nxgifb: outa xgifb_setup 3450");
return 0; return 0;
} }
#endif
static unsigned char VBIOS_BUF[65535]; static unsigned char VBIOS_BUF[65535];
...@@ -3461,13 +3459,12 @@ static struct pci_driver xgifb_driver = { ...@@ -3461,13 +3459,12 @@ static struct pci_driver xgifb_driver = {
XGIINITSTATIC int __init xgifb_init(void) XGIINITSTATIC int __init xgifb_init(void)
{ {
#ifndef MODULE
char *option = NULL; char *option = NULL;
if (fb_get_options("xgifb", &option)) if (fb_get_options("xgifb", &option))
return -ENODEV; return -ENODEV;
XGIfb_setup(option); XGIfb_setup(option);
#endif
return pci_register_driver(&xgifb_driver); return pci_register_driver(&xgifb_driver);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册