iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging : xgifb: Removes compilation conditionals

Browse Source 
This patch fixes a compilation warning in today linux-next
removing some compilation conditionals.

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Javier Martinez Canillas 2010-09-08 00:07:57 -04:00 committed by Greg Kroah-Hartman
parent b6c78757f9
commit 328f55baae
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/xgifb/XGI_main_26.c
View File

@ -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)
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 = {
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);
} }