Skip to content

Commit

Permalink
staging : xgifb: Removes compilation conditionals
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier Martinez Canillas authored and Greg Kroah-Hartman committed Sep 8, 2010
1 parent b6c7875 commit 328f55b
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/staging/xgifb/XGI_main_26.c
Original file line number Diff line number Diff line change
Expand Up @@ -2797,7 +2797,6 @@ static void XGIfb_post_setmode(void)

}

#ifndef MODULE
XGIINITSTATIC int __init XGIfb_setup(char *options)
{
char *this_opt;
Expand Down Expand Up @@ -2880,7 +2879,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)
printk("\nxgifb: outa xgifb_setup 3450");
return 0;
}
#endif

static unsigned char VBIOS_BUF[65535];

Expand Down Expand Up @@ -3461,13 +3459,12 @@ static struct pci_driver xgifb_driver = {

XGIINITSTATIC int __init xgifb_init(void)
{
#ifndef MODULE
char *option = NULL;

if (fb_get_options("xgifb", &option))
return -ENODEV;
XGIfb_setup(option);
#endif

return pci_register_driver(&xgifb_driver);
}

Expand Down

0 comments on commit 328f55b

Please sign in to comment.