staging: xgifb: Removes compilation conditionals
PATCH 2/3 staging: xgifb: Removes compilation conditionals
This patch fixes a compilation warning in today linux-next.
The first version of this patch introduced a compilation conditional but Greg pointed me that instead of adding more compilation conditional, the code needs to be fixed to not need more of them.
So this patch removes some compilation conditionals to eliminate the compilation warning.
--- drivers/staging/xgifb/XGI_main_26.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/staging/xgifb/XGI_main_26.c +1 -4
@@ -2744,7 +2744,6 @@ static void XGIfb_post_setmode(void) } -#ifndef MODULE XGIINITSTATIC int __init XGIfb_setup(char *options) {char *this_opt;
@@ -2827,7 +2826,6 @@ XGIINITSTATIC int __init XGIfb_setup(char *options)printk ("\nxgifb: outa xgifb_setup 3450" );return 0 ; } -#endif static unsigned char VBIOS_BUF [65535 ];
@@ -3454,13 +3452,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)); }
Signature · 1 line
1.7.0.4
Quoted 6 lines · Javier Martinez Canillas
This patch fixes a compilation warning in today linux-next.
The first version of this patch introduced a compilation conditional but Greg pointed me that instead of adding more compilation conditional, the code needs to be fixed to not need more of them.
So this patch removes some compilation conditionals to eliminate the compilation warning.
Again, this one fails to apply :(
thanks,
greg k-h