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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1283641668.9641.5.camel@lenovo>
Date:	Sat, 04 Sep 2010 19:07:48 -0400
From:	Javier Martinez Canillas <martinez.javier@...il.com>
To:	Greg Kroah-Hartman <gregkh@...e.de>,
	Bill Pemberton <wfp5p@...ginia.edu>,
	Randy Dunlap <randy.dunlap@...cle.com>,
	Arnaud Patard <apatard@...driva.com>,
	linux-kernel@...r.kernel.org, devel@...verdev.osuosl.org,
	Huang Weiyi <weiyi.huang@...il.com>
Subject: [PATCH 2/4] staging: xgifb: Add compilation conditionals


Signed-off-by: Javier Martinez Canillas <martinez.javier@...il.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



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/