[PATCH 2/4] staging: xgifb: Add compilation conditionals

[PATCH 2/4] staging: xgifb: Add compilation conditionals

[Javier Martinez Canillas]

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/staging/xgifb/XGI_main.h    |    2 ++
 drivers/staging/xgifb/XGI_main_26.c |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 72448e8..93837f3 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -345,7 +345,9 @@ static int XGIfb_userom = 0;
 static int XGIfb_registered;
 static int XGIfb_tvmode = 0;
 static int XGIfb_mem = 0;
+#ifndef MODULE
 static int XGIfb_pdc = 0;
+#endif
 static int enable_dstn = 0;
 static int XGIfb_ypan = -1;
 
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 3c80191..2cba4c4 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -843,6 +843,7 @@ static int XGIfb_validate_mode(int myindex)
 
 }
 
+#ifndef MODULE
 static void XGIfb_search_crt2type(const char *name)
 {
 	int i = 0;
@@ -861,7 +862,9 @@ static void XGIfb_search_crt2type(const char *name)
 	if(XGIfb_crt2type < 0)
 		printk(KERN_INFO "XGIfb: Invalid CRT2 type: %s\n", name);
 }
+#endif
 
+#ifndef MODULE
 static void XGIfb_search_queuemode(const char *name)
 {
 	int i = 0;
@@ -879,6 +882,7 @@ static void XGIfb_search_queuemode(const char *name)
 	if (XGIfb_queuemode < 0)
 		printk(KERN_INFO "XGIfb: Invalid queuemode type: %s\n", name);
 }
+#endif
 
 static u8 XGIfb_search_refresh_rate(unsigned int rate)
 {
@@ -926,6 +930,7 @@ static u8 XGIfb_search_refresh_rate(unsigned int rate)
 	}
 }
 
+#ifndef MODULE
 static void XGIfb_search_tvstd(const char *name)
 {
 	int i = 0;
@@ -941,6 +946,7 @@ static void XGIfb_search_tvstd(const char *name)
 		i++;
 	}
 }
+#endif
 
 static unsigned char XGIfb_bridgeisslave(void)
 {
-- 
1.7.0.4

Re: [PATCH 2/4] staging: xgifb: Add compilation conditionals

[Greg KH]

On Sat, Sep 04, 2010 at 07:07:48PM -0400, Javier Martinez Canillas wrote:
> 
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> ---
>  drivers/staging/xgifb/XGI_main.h    |    2 ++
>  drivers/staging/xgifb/XGI_main_26.c |    6 ++++++
>  2 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
> index 72448e8..93837f3 100644
> --- a/drivers/staging/xgifb/XGI_main.h
> +++ b/drivers/staging/xgifb/XGI_main.h
> @@ -345,7 +345,9 @@ static int XGIfb_userom = 0;
>  static int XGIfb_registered;
>  static int XGIfb_tvmode = 0;
>  static int XGIfb_mem = 0;
> +#ifndef MODULE
>  static int XGIfb_pdc = 0;
> +#endif

Ick, no, don't add conditionals, fix the code to not need such nonsense.

thanks,

greg k-h