[PATCH 2/3] staging: xgifb: Removes compilation conditionals

[PATCH 2/3] staging: xgifb: Removes compilation conditionals

[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.

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/staging/xgifb/XGI_main_26.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 46e7088..9722b33 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -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));
 }
 
-- 
1.7.0.4

Re: [PATCH 2/3] staging: xgifb: Removes compilation conditionals

[Greg KH]

On Tue, Sep 07, 2010 at 01:32:23AM -0400, Javier Martinez Canillas wrote:
> 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